DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
snipe-it/resources
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
..
assets Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
lang Horrible master -> dev merge that makes baby jesus cry :( 2019-03-20 02:24:23 -07:00
macros Added hungary time format 2019-03-13 19:45:30 -07:00
views Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00