diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-13 23:11:53 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-13 23:11:53 -0800 |
| commit | 48b8b4f68923c05695dd30e328d048a6116d04e6 (patch) | |
| tree | c6173bdfa11615facb6b4f71680c1be9fb769bb0 /modules/rest/controllers | |
| parent | 582765ca2fd1a6b17d07d0924647dcd9e4ee4bfb (diff) | |
| parent | 13f5d3aa33616c650b84f504e11d1117769266d1 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/rest/controllers')
| -rw-r--r-- | modules/rest/controllers/rest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php index 7a9e3b0b..3db5e9b1 100644 --- a/modules/rest/controllers/rest.php +++ b/modules/rest/controllers/rest.php @@ -36,7 +36,7 @@ class Rest_Controller extends Controller { $key = rest::get_access_token($user->id); rest::reply($key->access_key); - } + } public function __call($function, $args) { $input = Input::instance(); |