Bart Visscher 0120f3fd62 Merge branch 'routing' ...

Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php

2012-10-27 11:58:02 +02:00

..

admin.js

Add missing ; to js code

2012-09-05 22:26:09 +02:00

apps.js

show/hide navigation entries after enabling/disabling app

2012-10-26 20:13:24 +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