Skip to content

Commit

Permalink
merge master into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
pascal-sauer committed Apr 3, 2024
1 parent eba5036 commit 413bc61
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "MAgPIE - An Open Source land-use modeling framework",
"version": "4.7.2",
"version": "4.7.2dev",
"creators": [
{
"name": "Dietrich, Jan Philipp",
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.2] - 2024-04-02

### changed
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ authors:
email: [email protected]

title: MAgPIE - An Open Source land-use modeling framework
version: 4.7.2
version: 4.7.2dev
date-released: 2024-04-02
repository-code: https://github.com/magpiemodel/magpie
keywords:
Expand Down

0 comments on commit 413bc61

Please sign in to comment.