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
..
Module	Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop	2016-05-15 05:15:32 -04:00
Service	on login, make sure to clear existing session vars and start from fresh (moving from migrate() to invalidate())	2016-01-31 00:17:28 +01:00
Txtmsg	Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop	2016-05-15 05:15:32 -04:00
Util	Merge pull request #195 from Esselans/develop	2016-01-31 00:28:04 +01:00
Router.php	adding language subtags to template and support for right-to-left locales	2016-01-31 17:48:59 +01:00