Merge pull request #820 from calvinmclean/v36-4

Update changelog to release v36-4
cyverse · Sep 10, 2019 · 970a2e8 · 970a2e8
2 parents 1985e90 + 685d769
commit 970a2e8
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,9 +24,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
   - <in case of vulnerabilities>
 -->
 
-## [Unreleased](https://github.com/cyverse/troposphere/compare/v36-2...HEAD) - YYYY-MM-DD
+## [Unreleased](https://github.com/cyverse/troposphere/compare/v36-4...HEAD) - YYYY-MM-DD
 
 
+## [Unreleased](https://github.com/cyverse/troposphere/compare/v36-2...v36-4) - 2019-09-10
+### Fixed
+  - Patched style issue with XSEDE button
+    ([#818](https://github.com/cyverse/troposphere/pull/818))
+  - Updated django dependency to secure version
+    ([#819](https://github.com/cyverse/troposphere/pull/819))
+
 ## [v36-2](https://github.com/cyverse/troposphere/compare/v36-0...v36-2) - 2019-08-06
 ### Fixed
   - Updated python dependencies to secure versions