Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/migration/content.php		2014-02-18 18:31:33 +01:00
..
capabilities.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
hooks.php	make sure that we don't try to access an already deleted files, fixes some file source not found warnings	2013-11-28 13:31:08 +01:00
versions.php	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00