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
..
AssetCheckinController.php	Valo/checkin date in history of asset (#6733)	2019-03-13 21:36:32 -07:00
AssetCheckoutController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetFilesController.php	Put file contents instead of file object (creates subdirectory with a single file) (#6760)	2019-03-05 12:08:18 -08:00
AssetsController.php	Merge branch 'features/6204_email_audit-alerts' into develop	2019-05-06 08:45:13 -04:00
BulkAssetsController.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00