DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/app/Presenters
History
snipe bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop 
# Conflicts:
#	.all-contributorsrc
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/ImportsController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Requests/ItemImportRequest.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/version.php
#	docker/startup.sh
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
2019-03-20 02:17:02 -07:00
..
AccessoryPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ActionlogPresenter.php
AssetMaintenancesPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
AssetModelPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
AssetPresenter.php
CategoryPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
CompanyPresenter.php
ComponentPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ConsumablePresenter.php
DepreciationPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
LicensePresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
LicenseSeatPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
LocationPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ManufacturerPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
PredefinedKitPresenter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Presentable.php
Presenter.php
UserPresenter.php Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00