Merge branch 'release-1.12.4'

otto-torino · Nov 30, 2020 · 4a77ca5 · 4a77ca5
2 parents 748c7e2 + 76438ba
commit 4a77ca5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ install:
   - pip install webdriver-manager
   - pip install python-dotenv
   - pip install django-filer
+  - pip install django-tinymce
   - django-admin.py --version
   - pip install selenium
 before_script:

diff --git a/baton/static/baton/app/package-lock.json b/baton/static/baton/app/package-lock.json
diff --git a/baton/static/baton/app/package.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.12.3",
+  "version": "1.12.4",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.12.3'
+version = u'1.12.4'
 # The full version, including alpha/beta/rc tags.
-release = u'1.12.3'
+release = u'1.12.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='django-baton',
-    version='1.12.3',
+    version='1.12.4',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',