diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-05-13 01:49:54 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-05-13 01:49:54 +0000 |
| commit | a0b0b415515bff5f9edd43d373e8e78f3b3f8e4d (patch) | |
| tree | a101f7a71a33f75c21d4ac828f442d902f5d8af9 /modules/rest/models | |
| parent | 104430e9e1e8dacd5e4320e29e59fc59aa5c6ee9 (diff) | |
| parent | 9affa8ebbd539396d71f19003b91af577a8a183e (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
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 { } |