snipe 645529ba78 Merge pull request #9889 from ncareau/api-licenses ... Add licenses api parameters and fix a missing variable in license view.		2021-10-28 17:20:09 -07:00
..
Console	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
Events
Exceptions
Helpers	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
Http	Merge pull request #9889 from ncareau/api-licenses	2021-10-28 17:20:09 -07:00
Importer	Fixed merge error parse error	2021-10-20 18:11:34 -07:00
Jobs
LegacyEncrypter
Listeners	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
Models	Merge branch 'develop' into fixes/advanced_search_serial_v2	2021-10-28 16:42:10 -07:00
Notifications	fix rebase errors	2021-10-07 21:32:57 +02:00
Observers
Policies
Presenters	Adds reqestable as model bulk edit field	2021-10-28 15:15:54 -07:00
Providers	Added a validation to use the same name in categories with different types	2021-10-08 15:19:16 -05:00
Services	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00