Samuel Denis-D'Ortun bceb6ea3db Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop ... # Conflicts: # README.rst # docs/credits.rst # docs/intro.rst # src/includes/functions.inc.php # src/lang/de_DE.lang.php # src/lang/en_US.lang.php # src/lang/es_ES.lang.php # src/lang/fr_FR.lang.php # src/lang/it_IT.lang.php # src/lang/nl_NL.lang.php # src/lang/pl_PL.lang.php # src/lang/pt_BR.lang.php # src/lang/ru_RU.lang.php # src/lang/sv_SE.lang.php # src/lang/tr_TR.lang.php # src/lang/zh_CN.lang.php		2016-05-15 05:15:32 -04:00
..
functions.inc.php	Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop	2016-05-15 05:15:32 -04:00
password_compatibility_library.inc.php	updating copyright year in headers and email	2015-02-27 11:43:09 +01:00
psmconfig.inc.php	[refatoring] adding symfony service container and upgrading symfony packages to 2.6	2015-02-27 14:34:28 +01:00