Closed ljpengelen closed 5 years ago
This addresses https://github.com/kabisa/maji/issues/251.
Fixed conflict in Changelog. Merging.
This addresses https://github.com/kabisa/maji/issues/251.