Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ...

Conflicts:
	apps/files_encryption/tests/keymanager.php

2013-08-17 13:15:22 +02:00

..

admin.php

remove table layout for background jobs

2013-07-31 10:04:02 +02:00

apps.php

Hide a ghost image on the apps management page

2013-06-28 21:53:56 +03:00

help.php

Merge branch 'master' into fixing-bugtracker-link-master

2013-03-01 23:41:23 +01:00

oauth-required-apps.php

[core] From echo to p

2013-02-27 22:55:39 +01:00

personal.php

Merge branch 'master' into decrypt_files_again

2013-08-17 13:15:22 +02:00

settings.php

[core] From echo to p

2013-02-27 22:55:39 +01:00

users.php

Use !== and === in settings.

2013-07-21 13:55:25 +02:00