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
..
Makefile	trying out rst files dor readthedocs.org	2014-04-09 23:55:15 +02:00
conf.py	bumping version to 3.1.1	2014-11-06 14:40:39 +01:00
copyright.rst	removing docs indentation (markdown > resT..)	2014-04-10 20:08:46 +02:00
credits.rst	Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop	2016-05-15 05:15:32 -04:00
developers.rst	adding language subtags to template and support for right-to-left locales	2016-01-31 17:48:59 +01:00
faq.rst	adding short note about archiving/log retention (re issue #162)	2014-12-05 10:36:33 +01:00
index.rst	changing markdown to rst; updating docs; adding docs build dir to gitignore; adding docs to release export	2014-04-10 19:57:36 +02:00
install.rst	issue #131: adding timeout setting to cronjob as well	2014-11-06 10:53:43 +01:00
intro.rst	Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop	2016-05-15 05:15:32 -04:00
make.bat	fixing line endings	2015-02-27 11:07:11 +01:00
requirements.rst	removing docs indentation (markdown > resT..)	2014-04-10 20:08:46 +02:00