Merge branch 'deschler:master' into master

deschler · Jun 2, 2023 · a3e3c51 · a3e3c51
2 parents 00462a8 + 5297e15
commit a3e3c51
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.18.10](https://github.com/deschler/django-modeltranslation/compare/v0.18.10-beta.0...v0.18.10) (2023-06-02)
+
+
+### Bug Fixes
+
+* Add support for JSONField ([25f7305](https://github.com/deschler/django-modeltranslation/commit/25f73058f5f176a61c5368b7aee563874309687e)), closes [#685](https://github.com/deschler/django-modeltranslation/issues/685)
+
+### [0.18.10-beta.1](https://github.com/deschler/django-modeltranslation/compare/v0.18.10-beta.0...v0.18.10-beta.1) (2023-06-02)
+
+
+### Bug Fixes
+
+* Add support for JSONField ([25f7305](https://github.com/deschler/django-modeltranslation/commit/25f73058f5f176a61c5368b7aee563874309687e)), closes [#685](https://github.com/deschler/django-modeltranslation/issues/685)
+
+### [0.18.10-beta.1](https://github.com/deschler/django-modeltranslation/compare/v0.18.10-beta.0...v0.18.10-beta.1) (2023-06-02)
+
 ### [0.18.10-beta.0](https://github.com/deschler/django-modeltranslation/compare/v0.18.9...v0.18.10-beta.0) (2023-05-30)
 
 

diff --git a/Makefile b/Makefile
@@ -2,9 +2,9 @@ release:
 	standard-version
 
 publish: clean
+	git push --follow-tags
 	python setup.py sdist bdist_wheel
 	twine upload dist/*
-	git push --follow-tags
 
 clean:
 	rm -rf dist
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.18.10-beta.0
+0.18.10