Preparing release 1.5.4

jazzband · Feb 15, 2017 · 5d1bb76 · 5d1bb76
1 parent 3c5e5f9
commit 5d1bb76
Show file tree

Hide file tree

Showing 5 changed files with 478 additions and 473 deletions.
diff --git a/docs/history.rst b/docs/history.rst
@@ -11,6 +11,10 @@ Repository:
   * Fixed documentation and test code to use ``db_field.formfield`` instead of
     ``forms.CharField``.
 
+1.5.4 (2017-02-15)
+
+  * Update TinyMCE to 3.5.12
+
 Release 1.5 (2009-02-13):
   * Updated Google Code CSS location.
   * Fixed a compressor crash when 'theme' configuration was omitted.

diff --git a/metadata.py b/metadata.py
@@ -1,4 +1,4 @@
 name = 'tinymce'
 authors = 'Joost Cassee, Aljosa Mohorovic'
-version = '1.5.3'
+version = '1.5.4'
 release = version
diff --git a/setup.py b/setup.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 # from distutils.core import setup
 from setuptools import setup, find_packages

diff --git a/tinymce/static/tiny_mce/plugins/spellchecker/editor_plugin.js b/tinymce/static/tiny_mce/plugins/spellchecker/editor_plugin.js