updated changelog to fix merge conflict

This commit is contained in:
Francesco Mangiacrapa 2021-07-30 11:26:29 +02:00
parent 6a540c57e4
commit f66f62b7f5
1 changed files with 11 additions and 1 deletions

View File

@ -4,6 +4,16 @@
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).
## [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
First release
First release