Skip to content

Commit

Permalink
Merge pull request #121 from ambitioninc/develop
Browse files Browse the repository at this point in the history
3.1.1
  • Loading branch information
somewes committed Apr 3, 2018
2 parents ff523d8 + d031f71 commit 2df32ea
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion entity/version.py
@@ -1 +1 @@
__version__ = '3.1.0'
__version__ = '3.1.1'
2 changes: 2 additions & 0 deletions release_notes.md
@@ -1,5 +1,7 @@
## Release Notes

- 3.1.1:
- Remove 1.10 from setup file
- 3.1.0:
- Add jsonfield encoder (drop support for 1.10)
- 3.0.0:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -19,7 +19,7 @@ def get_version():


install_requires = [
'Django>=1.10',
'Django>=1.11',
'django-activatable-model>=1.1.0',
'django-manager-utils>=1.1.1',
'jsonfield>=0.9.20',
Expand Down

0 comments on commit 2df32ea

Please sign in to comment.