Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ... Conflicts: apps/files_encryption/tests/keymanager.php		2013-08-17 13:15:22 +07:00
..
ajax	Use multiple lines for the JSON data array.	2013-08-08 22:14:21 +07:00
appinfo	Merge branch 'master' into sabre-objecttree	2013-07-24 15:53:48 +07:00
console	remove cli check	2013-08-02 21:28:04 +07:00
css	Merge pull request #4113 from owncloud/delete-fix	2013-08-15 15:31:42 +07:00
js	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +07:00
l10n	remove ru_RU - fixes #3135	2013-08-17 11:43:37 +07:00
lib	if rename of file fails, the rename is undone in the view - #fix 2820	2013-06-15 09:58:27 +07:00
templates	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +07:00
tests	if rename of file fails, the rename is undone in the view - #fix 2820	2013-06-15 09:58:27 +07:00
admin.php	Remove outdated comments	2013-01-26 14:03:17 +07:00
download.php	merge master into filesystem	2013-01-28 19:37:58 +07:00
index.php	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +07:00
settings.php	merge master into filesystem	2013-01-28 19:37:58 +07:00
triggerupdate.php	Add a CLI script for manually triggering checking a folder for updates	2013-06-23 17:49:38 +07:00