updated changelog to fix merge conflict
This commit is contained in:
parent
6a540c57e4
commit
f66f62b7f5
12
CHANGELOG.md
12
CHANGELOG.md
|
@ -4,6 +4,16 @@
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
|
||||||
|
## [v1.1.0-SNAPSHOT] - 2021-01-29
|
||||||
|
|
||||||
|
#### Enhancements
|
||||||
|
|
||||||
|
[#20595] Porting common model
|
||||||
|
[#21890] Passed to mongoID
|
||||||
|
Passed to gcube-bom 2.0.1
|
||||||
|
|
||||||
|
|
||||||
## [v1.0.0] - 2020-12-01
|
## [v1.0.0] - 2020-12-01
|
||||||
|
|
||||||
First release
|
First release
|
||||||
|
|
Loading…
Reference in New Issue