Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307 ...

Conflicts:
	core/js/router.js
	settings/js/admin.js

2014-03-06 00:15:08 +01:00

..

admin.js

Merge branch 'master' into fix-7307

2014-03-06 00:15:08 +01:00

apps-custom.php

Add _many_ newlines at the end of files

2013-08-18 11:06:59 +02:00

apps.js

Merge pull request #7406 from owncloud/settings-apps.js-style

2014-02-26 14:24:34 +01:00

log.js

Fix some JSLint warnings

2013-07-31 21:21:02 +02:00

personal.js

Replace OC.Router.generate() with OC.generateUrl()

2014-03-02 22:30:24 +01:00

users.js

remove OC.Router.registerLoadedCallback()

2014-03-02 23:45:23 +01:00