Bart Visscher 0120f3fd62 Merge branch 'routing' ... Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php		2012-10-27 11:58:02 +02:00
..
vcategories	Make the core ajax calls use the router	2012-10-02 21:58:42 +02:00
appconfig.php	Make the core ajax calls use the router	2012-10-02 21:58:42 +02:00
navigationdetect.php	show/hide navigation entries after enabling/disabling app	2012-10-26 20:13:24 +02:00
requesttoken.php	Merge branch 'routing'	2012-10-27 11:58:02 +02:00
share.php	Merge branch 'master' into routing	2012-10-17 16:38:11 +02:00
translations.php	Make the core ajax calls use the router	2012-10-02 21:58:42 +02:00