snipe-it/resources/views/layouts
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
..
basic.blade.php Added ability to upload favicon and email logo 2018-12-05 19:56:12 -08:00
debug.blade.php Misc debug template for use with debugging CSV exports, etc 2016-09-12 14:05:31 -07:00
default.blade.php Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
edit-form.blade.php Fixed improper html nesting 2018-10-05 00:45:58 -07:00
setup.blade.php Removed inline signature.css 2018-10-01 08:20:31 -04:00