echosystem.fr
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
phpservermon/src/includes
History
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
..
functions.inc.php Merge branch 'develop' of github.com:phpservermon/phpservermon 2016-07-06 22:43:10 +10:00
password_compatibility_library.inc.php updating copyright year in headers and email 2015-02-27 11:43:09 +01:00
psmconfig.inc.php Bump version 3.2.0 2016-05-18 23:31:40 -04:00