Thomas Müller 30f1ec2521 Merge branch 'master' into test_annotations_working ... Conflicts: lib/private/util.php		2014-05-19 21:42:30 +02:00
..
l10n	[tx-robot] updated from transifex	2014-05-19 01:54:46 -04:00
private	Merge branch 'master' into test_annotations_working	2014-05-19 21:42:30 +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	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00