diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-16 07:02:22 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-16 07:02:22 -0700 |
| commit | b8201a71127a096a51ed03e0e08a98a66f847c8f (patch) | |
| tree | d806f0b9f35fc3aa912126ad3cf8d67c19ec0def /modules/user/controllers/admin_users.php | |
| parent | 15515fd3c64dd626746468862d5b8777679d88f6 (diff) | |
| parent | f1887422f8b4ba68dc273fe6f7d3f1123681e89a (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev
Diffstat (limited to 'modules/user/controllers/admin_users.php')
| -rw-r--r-- | modules/user/controllers/admin_users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index 521f82fa..0b748955 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Admin_Users_Controller extends Controller { +class Admin_Users_Controller extends Admin_Controller { public function index() { $view = new Admin_View("admin.html"); $view->content = new View("admin_users.html"); |