Merge branch 'master' into talmdal_dev

Conflicts:
	modules/rest/controllers/rest.php

1 files changed, 0 insertions, 21 deletions

diff --git a/modules/rest/models/user_access_token.php b/modules/rest/models/user_access_token.php
deleted file mode 100644
index 44330768..00000000
--- a/modules/rest/models/user_access_token.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * 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
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * 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 {
-}