diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-08-10 07:49:51 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-08-10 07:49:51 +0000 |
| commit | 17dcf1c3170bc905e3b0fdffc804d6f7229ac61b (patch) | |
| tree | 6a236c91314d3576b19493e42a9773a7610cce69 /lib/router.php | |
| parent | c1b19929f6234c4b9e30e16bae419c89c38c1169 (diff) | |
| parent | 06c5f490ea509f3a5222f42ee561c9b4f337af8e (diff) | |
Merge branch 'twitter-oauth' into 0.8.x
Conflicts:
scripts/getvaliddaemons.php
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php index 9ab46856d..f03cfcf6d 100644 --- a/lib/router.php +++ b/lib/router.php @@ -88,6 +88,10 @@ class Router $m->connect('doc/:title', array('action' => 'doc')); + // Twitter + + $m->connect('twitter/authorization', array('action' => 'twitterauthorization')); + // facebook $m->connect('facebook', array('action' => 'facebookhome')); |