snipe 87cd77b4df Merge remote-tracking branch 'origin/2.0' into bootstrap-table-experiment ...

# Conflicts:
#	app/controllers/admin/AssetsController.php

2015-07-27 23:41:22 -07:00

..

backend

Merge remote-tracking branch 'origin/2.0' into bootstrap-table-experiment

2015-07-27 23:41:22 -07:00

emails

Sans serif in emails

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

error

Fixes #806

2015-06-09 02:20:00 -07:00

frontend

Fixes #875 - allow user to decline asset and check asset back in if declined

2015-07-26 22:53:48 -07:00

paginator

Updated spacing for PSR-2

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