Tom Needham 227ada3257 Fix merge conflicts

2012-09-13 10:23:41 +00:00

..

ajax

return a message when app could not be enabled

2012-09-12 12:02:39 +02:00

css

Fix merge conflicts

2012-09-13 10:23:41 +00:00

img

Optimized image size

2012-08-18 13:56:04 +02:00

js

Add 'var' before some global js vars

2012-09-05 22:26:09 +02:00

l10n

[tx-robot] updated from transifex

2012-09-13 02:03:54 +02:00

templates

Fix merge conflicts

2012-09-13 10:23:41 +00:00

admin.php

adding space between) and {

2012-09-07 15:22:01 +02:00

apps.php

adding space between) and {

2012-09-07 15:22:01 +02:00

help.php

Update settings/help.php

2012-09-04 12:14:43 +03:00

languageCodes.php

Add more language name instead of codes for the setting choice

2012-09-05 16:16:19 +00: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

adding space between) and {

2012-09-07 15:22:01 +02:00

settings.php

adding space between) and {

2012-09-07 15:22:01 +02:00

trans.png

Optimized image size

2012-08-18 13:56:04 +02:00

users.php

adding space between) and {

2012-09-07 15:22:01 +02:00