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
..
form.php	Fixed missing language string in asset display	2017-05-18 22:20:43 -07:00
general.php	Assorted fixes (#3923)	2017-09-05 17:54:58 -07:00
message.php	Fixes #1190 - added basic audit workflow	2017-08-25 10:04:19 -07:00
table.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00