Merge branch 'develop' into 'fix/mrf-sample-doc'
authorfeld <feld@feld.me>
Tue, 18 Feb 2020 20:58:15 +0000 (20:58 +0000)
committerfeld <feld@feld.me>
Tue, 18 Feb 2020 20:58:15 +0000 (20:58 +0000)
commit53a7680c161d3bc7b046ec576e5269de668f547f
tree0b65513f42a8959b705d6e8b74d80a160becf74b
parent589bffa57d30b1133f951d0a6788c6f956f798a6
parent3416948cdf048421fb042fb71f54d2868d291aca
Merge branch 'develop' into 'fix/mrf-sample-doc'

# Conflicts:
#   docs/configuration/mrf.md
docs/configuration/mrf.md