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

..

confirm-bulk-delete.blade.php

Fixes #851 - bulk user delete

2015-07-24 22:37:15 -07:00

datatable.blade.php

Fixes #851 - bulk user delete

2015-07-24 22:37:15 -07:00

edit.blade.php

Fixed back button on user create

2015-08-04 20:48:54 -07:00

import.blade.php

Disable emailing imported users if demo mode

2015-06-23 18:38:21 -07:00

index.blade.php

Added location to user listing

2015-08-06 03:59:23 -07:00

view.blade.php

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

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