snipe 17e681ba7c Merge branch 'hotfixes/backup_CSRF' into develop ...

# Conflicts:
#	app/config/version.php

2015-12-01 11:47:56 -08:00

..

backend

Merge branch 'hotfixes/backup_CSRF' into develop

2015-12-01 11:47:56 -08:00

emails

Update checkin-asset.blade.php

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

error

Updated maintenance mode message

2015-10-23 14:35:42 -07: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