Björn Schießle e0173303e6 merge conflict fixed, settings-personal.php is no longer needed ... Conflicts: apps/files_versions/templates/settings-personal.php		2013-01-14 10:24:40 +01:00
..
files	[tx-robot] updated from transifex	2013-01-08 00:31:36 +01:00
files_encryption	[tx-robot] updated from transifex	2012-12-31 00:05:31 +01:00
files_external	[tx-robot] updated from transifex	2013-01-08 00:31:36 +01:00
files_sharing	Merge pull request #1053 from owncloud/ocs_api	2013-01-04 17:18:58 -08:00
files_versions	merge conflict fixed, settings-personal.php is no longer needed	2013-01-14 10:24:40 +01:00
user_ldap	[tx-robot] updated from transifex	2013-01-08 00:31:36 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-01-08 00:31:36 +01:00