Merge tag '0.25.7' into develop

CenterForOpenScience · May 9, 2018 · 5caac67 · 5caac67
2 parents be950b8 + 6389271
commit 5caac67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,11 @@
 ChangeLog
 *********
 
+0.25.7 (2018-05-08)
+===================
+- Feature: Allow settings config variables from the environment via JSON strings.  (thanks,
+@icereval!)
+
 0.25.6 (2018-05-08)
 ===================
 - Fix: Explictly declare google-auth dependency needed by WaterButler.

diff --git a/mfr/version.py b/mfr/version.py
@@ -1 +1 @@
-__version__ = '0.25.6'
+__version__ = '0.25.7'