nextcloud/apps
Florin Peter 313631edf6 Merge branch 'master' into file_encryption_external_storage_fixes
Conflicts:
	apps/files_encryption/hooks/hooks.php
2013-05-30 00:45:29 +02:00
..
files [tx-robot] updated from transifex 2013-05-29 02:10:54 +02:00
files_encryption Merge branch 'master' into file_encryption_external_storage_fixes 2013-05-30 00:45:29 +02:00
files_external [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
files_sharing Use the new session wrapper 2013-05-28 01:04:09 +02:00
files_trashbin add event.preventDefault to undelete function 2013-05-27 16:37:43 +02:00
files_versions [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
user_ldap [tx-robot] updated from transifex 2013-05-26 02:03:54 +02:00
user_webdavauth [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00