snipe fcc87b3219 Merge branch 'develop' ... # Conflicts: # config/version.php		2017-11-24 11:27:54 -08:00
..
Console	Merge branch 'develop'	2017-11-24 11:27:54 -08:00
Events
Exceptions
Helpers	More importer fixes (#4516)	2017-11-24 10:42:11 -08:00
Http	Check that assigned is an object in reports controller	2017-11-22 18:42:17 -08:00
Importer	More importer fixes (#4516)	2017-11-24 10:42:11 -08:00
Jobs
LegacyEncrypter
Listeners
Models	More importer fixes (#4516)	2017-11-24 10:42:11 -08:00
Notifications
Observers
Policies
Presenters	Add sorting and additional category types to dashboard categories	2017-11-21 20:33:30 -08:00
Providers