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 anni fa
..
ajax fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName 11 anni fa
css convert js call to css rule 11 anni fa
img new settings menu for new design 11 anni fa
js revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now 11 anni fa
l10n Merge branch 'master' into files_encryption 11 anni fa
templates revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now 11 anni fa
admin.php Merge branch 'master' into fixing-1354-master 11 anni fa
apps.php [core] From echo to p 11 anni fa
help.php Check if user is admin - bool 11 anni fa
languageCodes.php some more new languages recently introduced to ownCloud 11 anni fa
personal.php revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now 11 anni fa
routes.php Whitespace fixes 11 anni fa
settings.php Enhanced auth is totally unmaintained and broken 11 anni fa
users.php Style cleanup settings 11 anni fa