Bart Visscher 6081bfa2bc Merge branch 'master' into routing ... Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php		2012-10-17 16:38:11 +02:00
..
admin.js	Add missing ; to js code	2012-09-05 22:26:09 +02:00
apps.js	fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally	2012-10-08 15:49:48 +02:00
log.js	hide morelog button if there are no more log entries - bugfix for oc-1398	2012-08-04 17:38:31 +02:00
personal.js	Add missing ; to js code	2012-09-05 22:26:09 +02:00
users.js	Implement routing on javascript side	2012-10-05 09:42:36 +02:00