snipe-it/resources/views/partials
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
..
forms Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop 2019-03-08 16:18:48 -08:00
assets-assigned.blade.php Pull assigned asets preview into its own blade for re-use 2017-10-31 04:47:59 -07:00
bootstrap-table.blade.php Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
more-info.blade.php More help text updates 2018-10-04 21:14:45 -07:00