diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-03-19 22:03:45 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-03-19 22:03:45 +0000 |
| commit | 104430e9e1e8dacd5e4320e29e59fc59aa5c6ee9 (patch) | |
| tree | 5aa678433770199f1958f36c88894f377516293f /modules/rest/controllers/rest.php | |
| parent | a58aa6e97b0e44adf7a878db6e276b081e202192 (diff) | |
| parent | 0e9c626684fff0973a8512d5bd50ab7ba3a748ff (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/rest/controllers/rest.php')
| -rw-r--r-- | modules/rest/controllers/rest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php index b8d9a889..9f9b9aff 100644 --- a/modules/rest/controllers/rest.php +++ b/modules/rest/controllers/rest.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access."); /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2009 Bharat Mediratta + * Copyright (C) 2000-2010 Bharat Mediratta * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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(); |