Thomas Müller 8ee15025f0 Fix merge conflict		2014-06-03 19:05:21 +02:00
..
capabilities.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
hooks.php	Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 17:50:53 +02:00
versions.php	Fix merge conflict	2014-06-03 19:05:21 +02:00