snipe b29d7beb3a Merge branch 'develop' ... # Conflicts: # .gitignore # Dockerfile # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/AssetsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/GroupsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/UsersController.php # app/Http/routes.php # app/Models/Depreciation.php # app/Models/Location.php # config/version.php # resources/views/account/view-assets.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/modals.blade.php # resources/views/reports/custom.blade.php # snipeit.sh		2017-09-22 16:12:18 -07:00
..
audit.blade.php	Auduting improvements	2017-08-25 18:40:20 -07:00
bulk-checkout.blade.php	Formalize modals (#3898)	2017-08-26 16:06:52 -07:00
bulk-delete.blade.php	Assorted fixes (#3923)	2017-09-05 17:54:58 -07:00
bulk.blade.php	Fixes #3754 - incorrect language translation location for supplier	2017-07-17 16:39:19 -07:00
checkin.blade.php	Reformat all view files. (#3105)	2016-12-27 12:03:47 -08:00
checkout.blade.php	Progress towards better email notifications (#3911)	2017-08-31 11:14:21 -07:00
edit.blade.php	Formalize modals (#3898)	2017-08-26 16:06:52 -07:00
history.blade.php	Fixes #3600 - wrong route for hardware	2017-06-01 20:34:01 -07:00
index.blade.php	Fixes #3742 - add employee number to asset listing	2017-07-25 01:17:23 -07:00
labels.blade.php
qr-view.blade.php	Assorted fixes (#3923)	2017-09-05 17:54:58 -07:00
quickscan.blade.php	Move audited count to top of table	2017-08-31 21:31:07 -07:00
view.blade.php	Merge branch 'develop'	2017-09-22 16:12:18 -07:00