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