Merge pull request #485 from wagnert/master

Move OS specific templates and resources to dist packages
appserver-io · Feb 6, 2015 · d8a837c · d8a837c
2 parents 1a83642 + 16387a6
commit d8a837c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,6 @@
 * Log exceptions thrown in ServletEngine::process method
 * Move OS specific templates and resources to dist packages
 * Allow argument --install-dir for composer post-install-cmd
-* Moved OS specific Windows resources to appserver-io-dist/windows
 * Remove var/www/core_functions.php script and include from server.php
 * Add method logCriticalException() to AbstractServletEngine to simplify exception logging
 

diff --git a/resources/os-specific/windows/appserver.bat b/resources/os-specific/windows/appserver.bat
diff --git a/resources/templates/os-specific/windows/appserver-php5-fpm.bat.phtml b/resources/templates/os-specific/windows/appserver-php5-fpm.bat.phtml