Skip to content

Commit

Permalink
Merge branch 'release-2.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
abidibo committed Jun 16, 2021
2 parents 3b9bb3d + 5a16d08 commit 948474c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ install:
- pip install django-filer
- pip install django-tinymce
- pip install django-admin-rangefilter
- pip install django-admin-autocomplete-filter
- pip install docutils
- django-admin.py --version
- pip install selenium
Expand Down
2 changes: 1 addition & 1 deletion baton/static/baton/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion baton/static/baton/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "baton",
"version": "2.2.0",
"version": "2.2.1",
"description": "Django Baton App",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
# built documents.
#
# The short X.Y version.
version = u'2.2.0'
version = u'2.2.1'
# The full version, including alpha/beta/rc tags.
release = u'2.2.0'
release = u'2.2.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

setup(
name='django-baton',
version='2.2.0',
version='2.2.1',
packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
include_package_data=True,
license='MIT License',
Expand Down

0 comments on commit 948474c

Please sign in to comment.