nextcloud/apps/files_trashbin
Björn Schießle 632ca9f06d Merge branch 'master' into update-expire-function
Conflicts:
	apps/files_trashbin/lib/trash.php
2013-02-25 11:14:06 +01:00
..
ajax Whitespace fixes 2013-02-22 19:05:36 +01:00
appinfo Merge branch 'master' into update-expire-function 2013-02-25 11:14:06 +01:00
js Whitespace fixes 2013-02-22 19:05:36 +01:00
l10n [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
lib Merge branch 'master' into update-expire-function 2013-02-25 11:14:06 +01:00
templates Whitespace fixes 2013-02-22 19:05:36 +01:00
download.php debug output removed 2013-01-31 14:48:57 +01:00
index.php Whitespace fixes 2013-02-22 19:05:36 +01:00