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
..
appinfo	Merge master into ocs_api, fix conflicts.	2012-12-14 15:15:05 +00:00
css	Place the brackets in the first line	2012-10-24 13:09:09 +02:00
js	moving sharing email code to core	2012-12-10 23:22:42 +01:00
l10n	[tx-robot] updated from transifex	2012-12-31 00:05:31 +01:00
lib	Merge master into ocs_api, fix conflicts.	2012-12-14 15:15:05 +00:00
templates	refs #505 - defining publicListView based on template parameter	2012-11-18 12:28:04 +01:00
tests	External Share API: Move url down one level in response	2012-10-31 11:31:19 +00:00
public.php	Fix "There must be a single space between the closing parenthesis and the opening brace"	2012-12-15 00:43:46 +01:00