55 commits

Author	SHA1	Message	Date
Cayo Puigdefabregas	b23b4d9e2a	change version in this branch	2020-12-10 11:15:12 +01:00
Cayo Puigdefabregas	2e11a9f28f	resolve conflict CHANGELOG	2020-12-10 11:13:12 +01:00
Cayo Puigdefabregas	18993c557c	CHANGELOG.md	2020-12-10 11:03:36 +01:00
Cayo Puigdefabregas	73a08d6770	CHANGELOG	2020-12-10 10:41:02 +01:00
Cayo Puigdefabregas	5d6a84a18f	adding CHANGELOG file	2020-12-10 10:22:51 +01:00