Merge branch 'release-1.0.4'

otto-torino · Sep 28, 2017 · effe057 · effe057
2 parents b82e8f8 + 7808b28
commit effe057
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ baton/static/baton/app/node_modules
 build/
 dist/
 django_baton.egg-info/
+.ropeproject
diff --git a/baton/static/baton/app/package.json b/baton/static/baton/app/package.json
@@ -16,7 +16,7 @@
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-stage-0": "^6.16.0",
     "babel-register": "^6.18.0",
-    "bootstrap": "^4.0.0-alpha.6",
+    "bootstrap": "4.0.0-alpha.6",
     "css-loader": "^0.26.1",
     "file-loader": "^0.10.0",
     "font-awesome": "^4.7.0",

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