Merge branch 'master' into develop

This commit is contained in:
Andrew Morgan 2019-07-25 15:19:22 +01:00
commit f16aa3a44b
3 changed files with 12 additions and 3 deletions

View file

@ -35,4 +35,4 @@ try:
except ImportError:
pass
__version__ = "1.2.0rc2"
__version__ = "1.2.0"