Florin Peter 3579ba1e41 Merge branch 'master' into files_encryption ... Conflicts: apps/user_ldap/l10n/nn_NO.php core/l10n/es.php core/l10n/et_EE.php core/l10n/ja_JP.php core/l10n/nn_NO.php l10n/ca/core.po l10n/ca/files_external.po l10n/ca/settings.po l10n/cy_GB/core.po l10n/cy_GB/files.po l10n/cy_GB/files_encryption.po l10n/cy_GB/files_external.po l10n/cy_GB/files_sharing.po l10n/cy_GB/files_trashbin.po l10n/cy_GB/lib.po l10n/cy_GB/settings.po l10n/de_DE/core.po l10n/es/core.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/settings.po l10n/et_EE/user_ldap.po l10n/gl/core.po l10n/it/core.po l10n/ja_JP/core.po l10n/ja_JP/settings.po l10n/nn_NO/core.po l10n/nn_NO/user_ldap.po l10n/pt_BR/core.po 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_trashbin.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot l10n/zh_TW/files_sharing.po settings/l10n/et_EE.php		2013-05-01 09:31:26 +02:00
..
ajax	No need to strip slashes, json_decode handles that for us	2013-04-19 13:45:40 +02:00
appinfo	always connect file cache updater hooks first	2013-04-16 13:07:55 +02:00
css	Merge pull request #2279 from owncloud/refactor_upload_js	2013-04-06 15:44:08 -07:00
js	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
l10n	Merge branch 'master' into files_encryption	2013-05-01 09:31:26 +02:00
lib	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
templates	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
admin.php	Remove outdated comments	2013-01-26 14:03:17 +01:00
download.php	merge master into filesystem	2013-01-28 19:37:58 +01:00
index.php	Sed was wrong	2013-02-28 20:21:14 +01:00
settings.php	merge master into filesystem	2013-01-28 19:37:58 +01:00