diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-09-21 21:29:13 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-09-21 21:29:13 -0700 |
| commit | e5a78d39ec49332054cbc1a398d7c110e1d9191c (patch) | |
| tree | c2acb4731a381b7a1b28fa5ed505a76adb23a3ef /modules/user | |
| parent | 529ded3388673036314eefd5bfb1cfc0b76f7f9e (diff) | |
| parent | 33690a32bcf132e5ab470ff77ba23c073ac26271 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/controllers/albums.php
Diffstat (limited to 'modules/user')
| -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"); |