mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Resolves most merge conflicts. The only bit I was unable to merge from maint into master is the use of match-lambda in category-barchart.scm. This will have to be redone manually.