nextcloud/apps
Henrik Kjölhede b1b2eafa50 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
..
files Merge pull request #1059 from owncloud/fixing-998-master 2013-01-26 04:15:40 -08:00
files_encryption [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
files_external Merge remote-tracking branch 'upstream/master' 2013-01-26 21:51:18 +01:00
files_sharing Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
files_versions Spaces to tabs 2013-01-16 18:09:16 +01:00
user_ldap [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
user_webdavauth [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00