Tom Needham 6eb194b702 Merge branch 'master' into ocs_api ... Conflicts: l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot		2012-12-31 15:47:15 +00:00
..
oauth.css	Check if required apps are installed	2012-07-30 16:41:07 +00:00
settings.css	Merge pull request #902 from owncloud/storage-wording	2012-12-28 23:19:52 -08:00