kondou 65413a95dc Merge branch 'master' into oc_avatars ... Conflicts: config/config.sample.php		2013-09-03 04:43:11 +02:00
..
admin.js	Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff	2013-08-25 21:06:02 +02:00
apps-custom.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
apps.js	fix issues caused by introduction of sticky Apps management footer	2013-08-30 13:46:10 +02:00
isadmin.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
log.js	Fix some JSLint warnings	2013-07-31 21:21:02 +02:00
personal.js	Fix some of @jancborchardt's complaints in oc_avatars	2013-09-02 17:07:38 +02:00
users.js	Merge pull request #4262 from owncloud/fix_jslint_kondou	2013-08-20 12:45:10 -07:00