Merge branch 'jekyll' of https://anongit.kde.org/websites/kmymoney-org into…

Authored by ognarb on Jan 14 2020, 10:21 PM.

Description

Merge branch 'jekyll' of https://anongit.kde.org/websites/kmymoney-org into jekyll

Details

Merged Changes

CommitAuthorDetailsCommitted
7d477eae3bdetbaumgart
Cleanup a conflict marker leftover 
Jan 14 2020

Empty Commit

This commit is empty and does not affect any paths.