Victor Macko dc132831d4 Merge branch 'develop' of github.com:phpservermon/phpservermon ... Conflicts: src/includes/functions.inc.php src/lang/en_US.lang.php src/psm/Module/Config/Controller/ConfigController.class.php src/psm/Util/Server/Updater/StatusUpdater.php src/templates/config/config.tpl.html		2016-07-06 22:43:10 +10:00
..
config	Fix for issue #187 (Unable to connect to MySQL)	2015-06-17 23:15:10 +07:00
includes	Merge branch 'develop' of github.com:phpservermon/phpservermon	2016-07-06 22:43:10 +10:00
lang	Merge branch 'develop' of github.com:phpservermon/phpservermon	2016-07-06 22:43:10 +10:00
psm	Merge branch 'develop' of github.com:phpservermon/phpservermon	2016-07-06 22:43:10 +10:00
templates/default	Merge remote-tracking branch 'origin/master'	2016-07-06 22:37:50 +10:00
bootstrap.php	[refactoring] PSR-4 support through composer, mass-renaming all *.class.php to *.php to adhere to PSR-4	2015-02-27 15:18:37 +01:00
index.html	Fixed the statusbar color code place	2015-06-16 07:15:40 +00:00