Thomas Müller db39fede97 Merge branch 'master' into appframework-master ... Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php		2013-09-25 09:52:12 +02:00
..
app.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
capabilities.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
helper.php	Merge branch 'master' into appframework-master	2013-09-25 09:52:12 +02:00