Closed pm5k closed 3 years ago
Merged outstanding PR's from @angelic-knight and resolved some merge conflicts
Merged #37 (into dev) and #38 #39 and #47 into patches.
Some merge conflicts. I resolved them by taking Angelic's 3.16 branch as the golden source of truth.
@angelic-knight @Journeytojah
Abstract
Merged outstanding PR's from @angelic-knight and resolved some merge conflicts
Action Taken
Merged #37 (into dev) and #38 #39 and #47 into patches.
Caveats
Some merge conflicts. I resolved them by taking Angelic's 3.16 branch as the golden source of truth.
FAO
@angelic-knight @Journeytojah