commit caaef058907ce7558e1524f422492ad7e8216643 parent ca8b9fa760adcef2a4343693f38f1ec94d5b11f7 Author: Louis Holbrook <accounts-gitlab@holbrook.no> Date: Fri, 3 Jul 2020 22:10:07 +0000 Merge branch 'master' into 'test' # Conflicts: # feedwarrior/adapters/fileadapter.py