Thomas Müller 1a73e607bd Merge branch 'master' into more-themable-strings ... Conflicts: lib/template.php		2013-07-24 09:35:33 +02:00
..
files	Merge branch 'master' into more-themable-strings	2013-07-24 09:35:33 +02:00
files_encryption	[tx-robot] updated from transifex	2013-07-23 02:03:19 -04:00
files_external	Merge pull request #3392 from owncloud/googledrive	2013-07-23 12:23:08 -07:00
files_sharing	Merge branch 'master' into more-themable-strings	2013-07-24 09:35:33 +02:00
files_trashbin	[tx-robot] updated from transifex	2013-07-14 02:10:41 +02:00
files_versions	fix array access and change variable names according to the coding style	2013-07-12 11:25:40 +02:00
user_ldap	Merge branch 'master' into more-themable-strings	2013-07-24 09:35:33 +02:00
user_webdavauth	Merge branch 'master' into more-themable-strings	2013-07-24 09:35:33 +02:00