Bart Visscher b608675938 Merge pull request #1157 owncloud/move-OpenID ... Move openid.php to apps repo Conflicts: settings/routes.php		2013-01-11 22:57:40 +01:00
..
ajax	Merge pull request #1157 owncloud/move-OpenID	2013-01-11 22:57:40 +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	Merge pull request #994 from owncloud/enhanced_multiSelect	2013-01-11 10:23:04 -08:00
l10n	[tx-robot] updated from transifex	2013-01-11 00:06:14 +01:00
templates	Removed uneeded HTML tag	2013-01-11 14:43:56 +01:00
admin.php	Add security section to admin menu	2013-01-11 14:18:51 +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 #1157 owncloud/move-OpenID	2013-01-11 22:57:40 +01: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