Merge branch 'release-1.10.12'

otto-torino · Sep 4, 2020 · 962ab85 · 962ab85
2 parents 4e99b39 + ec77754
commit 962ab85
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/dist/baton.min.js.map b/baton/static/baton/app/dist/baton.min.js.map
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.10.11",
+  "version": "1.10.12",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/styles/_changeform.scss b/baton/static/baton/app/src/styles/_changeform.scss
@@ -131,7 +131,7 @@
 }
 
 .tab-content {
-  padding-top: 1rem;
+  // padding-top: 1rem;
 }
 
 .baton-form-include {

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

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

diff --git a/testapp/app/db.sqlite3 b/testapp/app/db.sqlite3