From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 14 Jun 2009 22:59:35 +0000 (-0700)
Subject: Merge branch '0.8.x' into groupblock
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bd26a80d45542c6b42f56ecf5472198f4600618b;p=quix0rs-gnu-social.git

Merge branch '0.8.x' into groupblock

Conflicts:
	lib/router.php
---

bd26a80d45542c6b42f56ecf5472198f4600618b
diff --cc lib/router.php
index 469d9a1715,5db401e741..3d870e5651
--- a/lib/router.php
+++ b/lib/router.php
@@@ -101,7 -101,7 +101,7 @@@ class Route
          $main = array('login', 'logout', 'register', 'subscribe',
                        'unsubscribe', 'confirmaddress', 'recoverpassword',
                        'invite', 'favor', 'disfavor', 'sup',
-                       'block', 'subedit', 'groupblock');
 -                      'block', 'unblock', 'subedit');
++                      'block', 'unblock', 'subedit', 'groupblock');
  
          foreach ($main as $a) {
              $m->connect('main/'.$a, array('action' => $a));