Thomas Müller f8cb8f4803 Merge branch 'master' into csrf-on-login-and-logout ... Conflicts: core/templates/login.php		2014-05-19 20:40:55 +02:00
..
l10n	[tx-robot] updated from transifex	2014-05-19 01:54:46 -04:00
private	Merge branch 'master' into csrf-on-login-and-logout	2014-05-19 20:40:55 +02:00
public	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00
autoloader.php	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00
base.php	Merge branch 'master' into csrf-on-login-and-logout	2014-05-19 20:40:55 +02:00