Merge pull request #1160 from benjaoming/testproject-500-changelog

testproject 500.html fix + changelog for 1159
django-wiki · Dec 28, 2021 · e99b509 · e99b509
2 parents 55a724a + fd687fb
commit e99b509
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -13,14 +13,14 @@ Release plan
 - **0.7.x** Removes Django 2.1 support, adds Django 3.1, 3.2
 
 
-0.7.10
-------
+0.7.10 (unreleased)
+-------------------
 
 Fixed
 ~~~~~
 
 - Missing validation for username uniqueness in in signup view :url-issue:`1152` (Benjamin Balder Bach)
-
+- Uploading and unpacking .zip files as attachments was broken :url-issue:`1159` (kylecapricious2)
 
 
 0.7.9

diff --git a/testproject/testproject/templates/500.html b/testproject/testproject/templates/500.html
@@ -10,7 +10,7 @@
 <h1 class="page-header">{% trans "500 - ERROR" %}</h1>
 
 <div class="error">
-  <p>{% blocktrans trimmed %]
+  <p>{% blocktrans trimmed %}
     Oh god no the demo has failed. Please rest assured that an open source developer is reading the
     logs to resolve this, because it's fun!!
     {% endblocktrans %}