Björn Schießle ee53bd1aa3 Merge branch 'master' into files_encryption ... Conflicts: lib/files/cache/cache.php		2013-05-22 15:29:22 +02:00
..
files	Merge pull request #3406 from owncloud/oc_dialogs_oc_template	2013-05-22 03:00:04 -07:00
files_encryption	fix pgsql error	2013-05-22 02:02:42 +02:00
files_external	[tx-robot] updated from transifex	2013-05-22 02:19:52 +02:00
files_sharing	[tx-robot] updated from transifex	2013-05-21 02:04:52 +02:00
files_trashbin	Merge branch 'master' into files_encryption	2013-05-21 15:30:19 +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-21 02:04:52 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-05-12 02:05:29 +02:00