snipe 79fe092c81 Merge branch 'develop' ... # Conflicts: # config/version.php		2017-12-05 13:20:39 -08:00
..
Console	Merge branch 'develop'	2017-12-04 23:51:53 -08:00
Events
Exceptions
Helpers	More importer fixes (#4516)	2017-11-24 10:42:11 -08:00
Http	Fixed #4444 - Added EOL back into asset lsiting and custom report	2017-12-05 13:03:11 -08:00
Importer	More importer fixes (#4516)	2017-11-24 10:42:11 -08:00
Jobs
LegacyEncrypter
Listeners
Models	Make sure there is a valid status label associated withthe asset when checking if deployable	2017-12-05 11:28:48 -08:00
Notifications	Only format ecpected checkin date if one exists	2017-11-09 13:40:55 -08:00
Observers
Policies
Presenters	Fixed #4444 - Added EOL back into asset lsiting and custom report	2017-12-05 13:03:11 -08:00
Providers