Merge branch 'master' into develop

# Conflicts: # docs/conf.py # tabbycat/settings/core.py
TabbycatDebate · Dec 13, 2020 · c8a1a21 · c8a1a21
2 parents dada372 + 20d9502
commit c8a1a21
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.github/CHANGELOG.rst b/.github/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Change Log
 ==========
 
+2.5.4
+-----
+*Release date: 14 December 2020*
+
+- Corrected a conflict in ballots when using declared winners without scores
+- Removed tournament/round caching from API views
+
+
 2.5.3
 -----
 *Release date: 7 December 2020*