DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/app
History
snipe acb90c7aee Horrible master -> dev merge that makes baby jesus cry :( 
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	composer.json
#	composer.lock
#	resources/views/auth/two_factor_enroll.blade.php
2019-03-20 02:24:23 -07:00
..
Console Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Events Valo/checkin date in history of asset (#6733) 2019-03-13 21:36:32 -07:00
Exceptions Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Helpers Add write-only image_source field for asset create/edit API endpoint (#6146) 2019-03-13 21:00:40 -07:00
Http Horrible master -> dev merge that makes baby jesus cry :( 2019-03-20 02:24:23 -07:00
Importer Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Jobs Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
LegacyEncrypter Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Listeners Valo/checkin date in history of asset (#6733) 2019-03-13 21:36:32 -07:00
Models Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
Notifications Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Observers Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Policies Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
Presenters Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
Providers Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
Services Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00