Merge remote-tracking branch 'upstream/develop' into accept-deletes
authorAlex Gleason <alex@alexgleason.me>
Mon, 20 Apr 2020 15:13:56 +0000 (10:13 -0500)
committerAlex Gleason <alex@alexgleason.me>
Mon, 20 Apr 2020 15:15:40 +0000 (10:15 -0500)
commitbedc558809832ce6ef6063fe91656a0fff0e222c
treef844a11ae25f1866bffb79d9eaf0d66aa2babcd6
parentb54c8813d632cb44c7deb207e91bd32f01f33794
parent28165dad3ac02a6d3ba4b0cda51992a1831515dd
Merge remote-tracking branch 'upstream/develop' into accept-deletes
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/mrf.md