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
..
ajax	Fix "There must be a single space between the closing parenthesis and the opening brace"	2012-12-15 00:43:46 +01:00
css	Merge branch 'master' into ocs_api	2012-12-31 15:47:15 +00:00
img	fix the broken image path on the apps page	2012-11-08 13:34:00 +01:00
js	adding missing translations for various strings + fixing tool tip on delete	2012-12-20 09:59:09 +01:00
l10n	[tx-robot] updated from transifex	2012-12-31 00:05:31 +01:00
templates	Merge branch 'master' into ocs_api	2012-12-31 15:47:15 +00:00
admin.php	add a check and a warning if setlocale is working	2012-12-19 15:10:33 +01:00
apps.php	Fixed new checkstyle issues in apps.php from build #1341.	2012-11-10 01:03:54 +01:00
help.php	fixing links docu/ ->doc/	2012-12-14 15:25:52 +01:00
languageCodes.php	Style: Remove all the dangling white spaces	2012-11-04 22:16:04 +01:00
oauth.php	API: Add callback_fail, add OC_OAuth::init and bespoke request token method	2012-09-04 11:10:42 +00:00
personal.php	Checkstyle fixes: NoSpaceAfterComma	2012-11-04 11:10:46 +01:00
routes.php	Merge pull request #136 from scambra/users-fixes	2012-10-29 15:31:37 -07:00
settings.php	Merge branch 'master' into routing	2012-10-17 16:38:11 +02:00
users.php	Change old variable name $default_quota to $defaultQuota	2012-12-28 19:14:33 -05:00