Merge remote-tracking branch 'origin/master' into merge-upstream

# Conflicts: # package-lock.json # protractor.conf.js
cloudfoundry · Jun 9, 2020 · 20582d5 · 20582d5
2 parents 968d497 + 566e233
commit 20582d5
Show file tree

Hide file tree

Showing 5 changed files with 3,680 additions and 2,504 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,20 @@
 # Change Log
 
+## 3.2.1
+
+[Full Changelog](https://github.com/SUSE/stratos/compare/3.2.0...3.2.1)
+
+**Improvements:**
+
+- Apply SSO whitelist to additional places [\#4318](https://github.com/cloudfoundry/stratos/issues/4318)
+
+**Fixes:**
+
+- User Button Misaligned [\#4316](https://github.com/cloudfoundry/stratos/issues/4316)
+
 ## 3.2.0
 
-[Full Changelog](https://github.com/cloudfoundry/stratos/compare/3.1.0...3.2.0)
+[Full Changelog](https://github.com/SUSE/stratos/compare/3.1.0...3.2.0)
 
 This release contains a number of fixes and improvements: