You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Florin Peter 3579ba1e41 Merge branch 'master' into files_encryption 11 vuotta sitten
..
ajax fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName 11 vuotta sitten
css convert js call to css rule 11 vuotta sitten
img new settings menu for new design 11 vuotta sitten
js revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now 11 vuotta sitten
l10n Merge branch 'master' into files_encryption 11 vuotta sitten
templates revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now 11 vuotta sitten
admin.php Merge branch 'master' into fixing-1354-master 11 vuotta sitten
apps.php [core] From echo to p 11 vuotta sitten
help.php Check if user is admin - bool 11 vuotta sitten
languageCodes.php some more new languages recently introduced to ownCloud 11 vuotta sitten
personal.php revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now 11 vuotta sitten
routes.php Whitespace fixes 11 vuotta sitten
settings.php Enhanced auth is totally unmaintained and broken 11 vuotta sitten
users.php Style cleanup settings 11 vuotta sitten