nextcloud/apps
Florin Peter 09b54ccb2b Merge branch 'master' into remove_unused_vars
Conflicts:
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/util.php
2013-05-28 11:00:49 +02:00
..
files [tx-robot] updated from transifex 2013-05-28 02:07:51 +02:00
files_encryption Merge branch 'master' into remove_unused_vars 2013-05-28 11:00:49 +02:00
files_external [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
files_sharing [tx-robot] updated from transifex 2013-05-24 02:02:43 +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