Prepare release

To-om · To-om · commit 9be2418776de · 2020-10-30T14:39:41.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## [3.1.0](https://github.com/TheHive-Project/Cortex/milestone/27) (2020-10-30)
+
+**Implemented enhancements:**
+
+- Improve Docker image [\#296](https://github.com/TheHive-Project/Cortex/issues/296)
+- Impossible to load catalog through a proxy [\#297](https://github.com/TheHive-Project/Cortex/issues/297)
+- Update login page design [\#303](https://github.com/TheHive-Project/Cortex/issues/303)
+
+**Fixed bugs:**
+
+- [Bug] Cortex and boolean ConfigurationItems  [\#309](https://github.com/TheHive-Project/Cortex/issues/309)
+
 ## [3.1.0-RC1](https://github.com/TheHive-Project/Cortex/milestone/21) (2020-08-13)
 
 **Implemented enhancements:**
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "3.1.0-RC1-1"
+version in ThisBuild := "3.1.0-1"
diff --git a/www/package.json b/www/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cortex",
-  "version": "3.1.0-RC1",
+  "version": "3.1.0",
   "description": "A powerfull observable analysis engine",
   "license": "AGPL-3.0-or-later",
   "homepage": "https://github.com/TheHive-Project/Cortex",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cortex",`
`3`		`- "version": "3.1.0-RC1",`
	`3`	`+ "version": "3.1.0",`
`4`	`4`	`"description": "A powerfull observable analysis engine",`
`5`	`5`	`"license": "AGPL-3.0-or-later",`
`6`	`6`	`"homepage": "https://github.com/TheHive-Project/Cortex",`