DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 07:47:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
snipe-it/resources
History
snipe 407445456a Merge branch 'features/6204_email_audit-alerts' into develop 
# Conflicts:
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/LicensesController.php
#	composer.json
#	composer.lock
#	config/version.php
#	resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
..
assets Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
lang Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
macros Added first-initial dot lastname format for usernames/email 2019-04-02 18:21:54 -07:00
views Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00