merge master into develop

caviddhen · Jun 11, 2024 · 7c57c36 · 7c57c36
1 parent bfe10fc
commit 7c57c36
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,6 +1,6 @@
 {
   "title": "MAgPIE - An Open Source land-use modeling framework",
-  "version": "4.8.0",
+  "version": "4.8.0dev",
   "creators": [
     {
       "name": "Dietrich, Jan Philipp",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## [Unreleased]
+
+### changed
+-
+
+### added
+-
+
+### removed
+-
+
+### fixed
+-
+
+
 ## [4.8.0] - 2024-06-10
 
 ### changed

diff --git a/CITATION.cff b/CITATION.cff
@@ -151,7 +151,7 @@ abstract: The *Model of Agricultural Production and its Impact on the Environmen
   exogenously given population in 10 food energy categories, based on regional diets.
   Future trends in food demand are derived from a cross-country regression analysis,
   based on future scenarios on GDP and population growth.
-version: 4.8.0
+version: 4.8.0dev
 date-released: 2024-06-10
 repository-code: https://github.com/magpiemodel/magpie
 keywords: