master #213

Merged

mpeltriaux merged 4 commits from master into Docker

mpeltriaux commented

Owner

Update Docker

mpeltriaux added 4 commits

ab534556a2 Fix geometry conflict message

* fixes bug where geometry conflicts template message has been rendered despite having no active geometry conflict
    * happened in case of existing geometry conflicts related to an as deleted marked entry

cd914c880f Merge pull request 'Fix geometry conflict message' (#211 ) from hotfix_geom_conflict_msg_with_deleted_entry into master

Reviewed-on: SGD-Nord/konova#211

109a45c564 #208 API non existing atomID

* handles error response for non existing atomID properly according to isse #208

fd6143b304 Merge pull request '#208 API non existing atomID' (#212 ) from 208_API_non_existing_values into master

Reviewed-on: SGD-Nord/konova#212

mpeltriaux merged commit 87765187b8 into Docker 2 years ago

mpeltriaux referenced this issue from a commit

Merge pull request 'master' (#213) from master into Docker

The pull request has been merged as 87765187b8.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b master Docker

git pull origin master

Step 2:

Merge the changes and update on Gitea.

git checkout Docker

git merge --no-ff master

git push origin Docker

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Loading…

There is no content yet.

Labels Milestones

master #213

Step 1:

Step 2: