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
..
Controllers	Merge branch 'develop'	2017-09-22 16:12:18 -07:00
Middleware	Small phpcbf cleanup	2016-12-29 14:02:18 -08:00
Requests	Move LDAP validation into form request	2017-08-31 10:44:00 -07:00
Traits	Putting uniqueUndeleted into a trait for use across models	2016-07-26 01:39:30 -07:00
Transformers	Custom field import repair (#3968)	2017-09-18 12:29:08 -07:00
Kernel.php	Updated auth:api in kernel	2017-01-11 14:54:11 -08:00