echosystem.fr
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
phpservermon/src
History
Pepijn Over 6b4668937d Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop 
Conflicts:
	src/lang/de_DE.lang.php
	src/lang/en_US.lang.php
	src/psm/Module/Server/Controller/ServerController.class.php
	src/templates/server/view.tpl.html
 		2014-07-30 15:03:57 +02:00
..
includes Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop 2014-07-30 15:03:57 +02:00
lang Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop 2014-07-30 15:03:57 +02:00
psm Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop 2014-07-30 15:03:57 +02:00
templates Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop 2014-07-30 15:03:57 +02:00
bootstrap.php issue #55: adding xhr functionality to controllers 2014-04-24 23:50:47 +02:00