snipe b3249dcf48 Merge remote-tracking branch 'origin/develop' into 2.0 ...

# Conflicts:
#	app/controllers/admin/UsersController.php
#	app/models/Model.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/users/index.blade.php
#	composer.lock

2015-08-11 13:20:25 -07:00

..

account

First rough pass at asset acceptance report

2015-08-07 18:50:55 -04:00

admin

Merge remote-tracking branch 'origin/develop' into 2.0

2015-08-11 13:20:25 -07:00

.gitkeep

Initial laravel import

2013-11-13 01:59:39 -05:00

AdminController.php

Fixes #237 - reporting-only group

2014-11-04 18:21:10 -05:00

AuthController.php

Fixed forgotten password

2015-07-24 17:16:50 -07:00

AuthorizedController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

BaseController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

HomeController.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00