Merge branch 'master' into 42-fix-migration-syntax-for-unique-constraints

CHANGELOG.rst

@@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+`2.0rc1`_ - 2021-06-23
+----------------------
+
+Fixed
+~~~~~
+
+* Include parents in unique key of FAQ sections for site and category.
+
+
 `2.0b1`_ - 2021-06-02
 ---------------------
 
@@ -56,3 +65,4 @@ Added
 .. _2.0a2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0a2
 .. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0b0
 .. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0b1
+.. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Hjelp/-/tags/2.0rc1

pyproject.toml

@@ -31,7 +31,7 @@ secondary = true
 
 [tool.poetry.dependencies]
 python = "^3.9"
-aleksis-core = "^2.0b0"
+aleksis-core = "^2.0rc"
 
 [tool.poetry.dev-dependencies]
 aleksis-builddeps = "*"