Merge branch 'develop' into issue/1855
authorMark Felder <feld@FreeBSD.org>
Wed, 17 Jun 2020 17:50:06 +0000 (12:50 -0500)
committerMark Felder <feld@FreeBSD.org>
Wed, 17 Jun 2020 17:50:06 +0000 (12:50 -0500)
commit3462d4b995a995ad523139a865b34a824e02674d
tree273a000ee55c9bb6a5344a507025600508227382
parent96493da7bdab4ff4a51cbebf18df4127ddc47990
parentd772361e6209e6b5733e9fe52b3671cd222060b3
Merge branch 'develop' into issue/1855
config/config.exs
config/description.exs