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
..
LoginController.php	Implementing the PSR12 standard	2019-12-11 21:27:04 +01:00
ProfileController.php	Added support for Discord using Webhooks (#971)	2020-08-12 21:33:44 +02:00
UserController.php	Merge remote-tracking branch 'origin/develop' into feature/public_page	2020-08-24 22:27:51 +02:00