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