Skip to content
Snippets Groups Projects
Verified Commit ffe910e7 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge branch 'main' into dev

parents f8f1ec31 c59d04b6
No related branches found
No related tags found
No related merge requests found
Pipeline #18477 passed
...@@ -8,8 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -8,8 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## ## [Unreleased] ##
### Added ### ### Added ###
- function in administration that generates passwords that comply with the
rules
### Changed ### ### Changed ###
...@@ -19,6 +17,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -19,6 +17,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### ### Fixed ###
### Security ###
## [0.7.0] - 2022-01-21 ##
### Added ###
- Function in administration that generates passwords that comply with the rules.
### Fixed ###
- #90 compare_entities function in apiutils does not check units - #90 compare_entities function in apiutils does not check units
### Security ### ### Security ###
......
...@@ -45,11 +45,11 @@ from setuptools import find_packages, setup ...@@ -45,11 +45,11 @@ from setuptools import find_packages, setup
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
######################################################################## ########################################################################
ISRELEASED = False
MAJOR = 0 MAJOR = 0
MINOR = 6 MINOR = 7
MICRO = 2 MICRO = 1
PRE = "" # e.g. rc0, alpha.1, 0.beta-23 PRE = "" # e.g. rc0, alpha.1, 0.beta-23
ISRELEASED = False
if PRE: if PRE:
VERSION = "{}.{}.{}-{}".format(MAJOR, MINOR, MICRO, PRE) VERSION = "{}.{}.{}-{}".format(MAJOR, MINOR, MICRO, PRE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment