Pepijn Over 625500495f Merge branch 'develop' of https://github.com/nerdalertdk/phpservermon into nerdalertdk-develop ... Conflicts: src/psm/Module/Config/Controller/ConfigController.class.php src/psm/Util/Updater/StatusNotifier.class.php		2014-04-25 07:12:49 +02:00
..
Controller	Merge branch 'develop' of https://github.com/nerdalertdk/phpservermon into nerdalertdk-develop	2014-04-25 07:12:49 +02:00
ConfigModule.class.php	bumping version to 3.0.0 for upcoming release, removing closing	2014-04-05 09:51:55 +02:00