nextcloud/apps
Thomas Müller d2961dcf11 Merge branch 'master' into lukepolo-master
Conflicts:
	apps/files/js/filelist.js
2014-04-09 22:00:25 +02:00
..
files Merge branch 'master' into lukepolo-master 2014-04-09 22:00:25 +02:00
files_encryption [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
files_external [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
files_sharing remove obsolete code 2014-04-09 12:09:28 +02:00
files_trashbin [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
files_versions [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
user_ldap Merge pull request #7837 from owncloud/fix_7530 2014-04-09 12:27:17 +02:00
user_webdavauth [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00