Skip to content

Commit 1faf523

Browse files
committed
Merge branch 'prepare-3.2.0' into master
2 parents 3d49b97 + cc75fb6 commit 1faf523

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

CHANGELOG.rst

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ Changelog
44
This document describes changes between each past release.
55

66

7-
3.2.0 (unreleased)
7+
3.2.0 (2020-12-10)
88
==================
99

10-
- Nothing changed yet.
10+
- Remove support for universal builds
11+
- Add compatibility of django-filebrowser with tinymce 5
12+
- Load the CHANGELOG in the documentation front page
13+
- Fix en_US language loading
14+
- Speed up tests by removing the loading of a database
15+
- Add verbosity option to tests
16+
- Assume TinyMCE files are utf-8 encoded
1117

1218

1319
3.1.0 (2020-09-29)

README.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ In your code:
6565
Releases
6666
========
6767

68-
Latest release is 3.1.0. It supports Python 3.6+ with Django 2.2 and 3.0
68+
Latest release is 3.2.0. It supports Python 3.6+ with Django 2.2 and 3.0
69+
Using TinyMCE 5.5.0.
6970

7071
Previous releases can be found on github, but they are no longer maintained.
7172

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def read_file(filename):
2020

2121
setup(
2222
name="django-tinymce",
23-
version="3.2.0.dev0",
23+
version="3.2.0",
2424
packages=find_packages(),
2525
include_package_data=True,
2626
author="Aljosa Mohorovic",

0 commit comments

Comments
 (0)