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	fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName	2013-04-08 23:11:33 +02:00
css	convert js call to css rule	2013-03-28 15:43:14 +01:00
img	new settings menu for new design	2013-01-17 12:45:33 +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
templates	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
admin.php	remove log sort in admin section	2013-04-23 14:56:33 +02:00
apps.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
help.php	Check if user is admin - bool	2013-01-14 19:45:17 +01:00
languageCodes.php	some more new languages recently introduced to ownCloud	2013-03-01 23:28:54 +01:00
personal.php	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
routes.php	Whitespace fixes	2013-02-22 19:05:36 +01:00
settings.php	Enhanced auth is totally unmaintained and broken	2013-01-14 21:39:49 +01:00
users.php	Style cleanup settings	2013-02-21 23:47:56 +01:00