merged master and fixed conflict

amccarthy1 · Mar 20, 2019 · 9d8ec7c · 9d8ec7c
2 parents 42f1ae9 + 766d9d3
commit 9d8ec7c
Show file tree

Hide file tree

Showing 7 changed files with 1,597 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 # Change Log
 
-## [v1.9.0] - 2019-03-13
+## [v1.10.0] - 2019-03-20
 
 - #215 Add support for Databases - @mikejholly
 
+## [v1.9.0] - 2019-03-18
+
+- #214 add support for enable_proxy_protocol. - @mregmi
+
 ## [v1.8.0] - 2019-03-13
 
 - #210 Expose tags on storage volume create/list/get. - @jcodybaker