snipe b492ac4950 Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration ...

# Conflicts:
#	.gitignore
#	app/controllers/admin/AccessoriesController.php
#	app/controllers/admin/AssetsController.php
#	app/controllers/admin/LicensesController.php
#	app/models/Accessory.php
#	app/models/Asset.php
#	app/routes.php
#	app/views/backend/accessories/index.blade.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/hardware/index.blade.php
#	app/views/backend/licenses/index.blade.php

2015-10-20 17:52:02 -07:00

..

backend

Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration

2015-10-20 17:52:02 -07:00

emails

Update checkin-asset.blade.php

2015-09-11 21:48:05 -05:00

error

Change to using route in error message

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

frontend

Fixes #1130 - don't try to send email if email is not provided with the user

2015-08-28 12:15:07 -07:00

paginator

Updated spacing for PSR-2

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