Merge branch '0.9.x' into adminpanel

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index bad3decad51aa32f35fef35201d241d1256f9252..321b4273e75b8e37811208613741d4335ed14461 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -585,6 +585,8 @@ class Router
             $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
             $m->connect('api/trends.json', array('action' => 'twitapitrends'));
 
+            $m->connect('admin/site', array('action' => 'siteadminpanel'));
+
             $m->connect('getfile/:filename',
                         array('action' => 'getfile'),
                         array('filename' => '[A-Za-z0-9._-]+'));