snipe 780222d372 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # resources/views/users/print.blade.php		2022-05-10 17:26:26 -07:00
..
AccessoryPresenter.php
ActionlogPresenter.php
AssetAuditPresenter.php
AssetMaintenancesPresenter.php
AssetModelPresenter.php
AssetPresenter.php
CategoryPresenter.php
CompanyPresenter.php
ComponentPresenter.php
ConsumablePresenter.php
DepreciationPresenter.php
DepreciationReportPresenter.php
LicensePresenter.php
LicenseSeatPresenter.php
LocationPresenter.php
ManufacturerPresenter.php
PredefinedKitPresenter.php
Presentable.php
Presenter.php
UserPresenter.php