diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-31 07:14:06 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-03-31 07:14:06 -0700 |
| commit | f2ed1eeab2074fc004c604d02bbf2ebe7c1177db (patch) | |
| tree | fe0f4037e44cd33d5716d1a44930ed19ca3a34fc /modules/rest/models | |
| parent | e56473c5d78842210b7825300bd9b373c104cb83 (diff) | |
| parent | ca977dce516b9e2ca9539db69fce188ed33d971c (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/rest/controllers/rest.php
Diffstat (limited to 'modules/rest/models')
| -rw-r--r-- | modules/rest/models/user_access_key.php (renamed from modules/rest/models/user_access_token.php) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/rest/models/user_access_token.php b/modules/rest/models/user_access_key.php index 44330768..1da0f5eb 100644 --- a/modules/rest/models/user_access_token.php +++ b/modules/rest/models/user_access_key.php @@ -17,5 +17,5 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class User_Access_Token_Model extends ORM { +class User_Access_Key_Model extends ORM { } |