snipe 221cf1f9c8 Merge branch 'checkout-to-things-v1' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-things-v1 ...

# Conflicts:
#	app/Http/Controllers/AssetsController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/UsersController.php
#	app/Presenters/AssetPresenter.php

2016-12-29 16:20:17 -08:00

..

accessories.blade.php

Reformat all view files. (#3105)

2016-12-27 12:03:47 -08:00

activity.blade.php

Reformat all view files. (#3105)

2016-12-27 12:03:47 -08:00

asset_maintenances.blade.php

Small phpcbf cleanup

2016-12-29 14:02:18 -08:00

asset.blade.php

Reformat all view files. (#3105)

2016-12-27 12:03:47 -08:00

custom.blade.php

Reformat all view files. (#3105)

2016-12-27 12:03:47 -08:00

depreciation.blade.php

Port more assignedUser to assignedTo.

2016-12-29 09:31:16 -05:00

index.blade.php

Port more assignedUser to assignedTo.

2016-12-29 09:31:16 -05:00

licenses.blade.php

Reformat all view files. (#3105)

2016-12-27 12:03:47 -08:00

unaccepted_assets.blade.php

Port more assignedUser to assignedTo.

2016-12-29 09:31:16 -05:00