nextcloud/apps
Björn Schießle 13017ce9e1 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
..
files [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
files_encryption Merge branch 'master' into files_encryption_check_private_key 2013-06-10 12:12:07 +02:00
files_external [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
files_sharing [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
files_trashbin [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
files_versions [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
user_ldap [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
user_webdavauth [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00