Merge branch 'dev'

oemof · Oct 25, 2018 · 2c0b513 · 2c0b513
2 parents c16f02d + 1256098
commit 2c0b513
Show file tree

Hide file tree

Showing 26 changed files with 10,158 additions and 1,933 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-__version__ = "0.0.4"
+__version__ = "0.0.5"