Merge branch 'release-2.2.0' into devel

olgabrani · olgabrani · commit 153d702ee4d9 · 2019-06-27T09:02:26.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [v2.2.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.1.0...v2.2.0) - 2019-06-27
 
 ### Added
 - Module discopower: Add style rules and logos for the buttons of the IdPs:
diff --git a/version.txt b/version.txt
@@ -1,2 +1,2 @@
 simplesamlphp-module-themevanilla
-version 2.1.0
+version 2.2.0

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`simplesamlphp-module-themevanilla`
`2`		`-version 2.1.0`
	`2`	`+version 2.2.0`