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

..

backend

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

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

emails

Sans serif in emails

2015-07-26 21:21:52 -07:00

error

Change to using route in error message

2015-08-04 10:40:40 +10:00

frontend

Request button strings

2015-07-30 14:52:55 -07:00

paginator

Updated spacing for PSR-2

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