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
..
checkin.blade.php	Fix an issue when trying to checkin a license seat. [ch46] (#6599)	2019-01-17 20:36:40 -08:00
checkout.blade.php	Add category to licenses	2018-05-08 00:14:38 -07:00
edit.blade.php	Pass variable to edit-form to determine whether we should have a top submit button	2018-10-04 21:19:25 -07:00
index.blade.php	Features/better table options (#5018)	2018-02-16 13:22:55 -08:00
view.blade.php	Merge branch 'features/6204_email_audit-alerts' into develop	2019-05-06 08:45:13 -04:00