Merge branch 'prepare-3.2.0' into master

jazzband · Dec 10, 2020 · 1faf523 · 1faf523
2 parents 3d49b97 + cc75fb6
commit 1faf523
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,10 +4,16 @@ Changelog
 This document describes changes between each past release.
 
 
-3.2.0 (unreleased)
+3.2.0 (2020-12-10)
 ==================
 
-- Nothing changed yet.
+- Remove support for universal builds
+- Add compatibility of django-filebrowser with tinymce 5
+- Load the CHANGELOG in the documentation front page
+- Fix en_US language loading
+- Speed up tests by removing the loading of a database
+- Add verbosity option to tests
+- Assume TinyMCE files are utf-8 encoded
 
 
 3.1.0 (2020-09-29)

diff --git a/README.rst b/README.rst
@@ -65,7 +65,8 @@ In your code:
 Releases
 ========
 
-Latest release is 3.1.0. It supports Python 3.6+ with Django 2.2 and 3.0
+Latest release is 3.2.0. It supports Python 3.6+ with Django 2.2 and 3.0
+Using TinyMCE 5.5.0.
 
 Previous releases can be found on github, but they are no longer maintained.
 

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def read_file(filename):
 
 setup(
  name="django-tinymce",
- version="3.2.0.dev0",
+ version="3.2.0",
  packages=find_packages(),
  include_package_data=True,
  author="Aljosa Mohorovic",