kondou 0ce35af02a Merge branch 'master' into improve_app-management ... Conflicts: settings/js/apps.js		2013-08-21 19:20:25 +02:00
..
admin.js	Use !== and === in settings.	2013-07-21 13:55:25 +02:00
apps-custom.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
apps.js	Move .errormsg from settings-css to .warning in core. Reusable!	2013-08-18 17:37:22 +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	Merge pull request #4262 from owncloud/fix_jslint_kondou	2013-08-20 12:45:10 -07:00
users.js	Merge pull request #4262 from owncloud/fix_jslint_kondou	2013-08-20 12:45:10 -07:00