TimZ99 e599c18f0b Merge remote-tracking branch 'origin/develop' into feature/public_page ... # Conflicts: # README.rst # config.php.sample # src/includes/psmconfig.inc.php # src/lang/en_US.lang.php # src/psm/Module/User/Controller/UserController.php # src/psm/Util/Install/Installer.php		2020-08-24 22:27:51 +02:00
..
Makefile	trying out rst files dor readthedocs.org	2014-04-09 23:55:15 +02:00
conf.py	Added support for Discord using Webhooks (#971)	2020-08-12 21:33:44 +02:00
copyright.rst	preparing for 3.2.0 release	2018-03-27 23:24:25 +02:00
credits.rst	Added support for Discord using Webhooks (#971)	2020-08-12 21:33:44 +02: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	Merge remote-tracking branch 'origin/develop' into feature/public_page	2020-08-24 22:27:51 +02: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	add info about updater.sh (#899)	2020-08-12 21:27:12 +02:00
intro.rst	Jabber (XMPP) notifications (#852)	2020-04-19 15:31:40 +02:00
make.bat	fixing line endings	2015-02-27 11:07:11 +01:00
requirements.rst	Re-adding support PHP 5.5.9/7.0.x (#915)	2020-05-15 16:55:57 +02:00