master #213

Merged

mpeltriaux merged 4 commits from master into Docker

2022-09-29 10:46:31 +02:00

Author	SHA1	Message	Date
mpeltriaux	fd6143b304	Merge pull request '#208 API non existing atomID' (#212 ) from 208_API_non_existing_values into master Reviewed-on: SGD-Nord/konova#212	2022-09-29 10:45:44 +02:00
mpeltriaux	109a45c564	#208 API non existing atomID * handles error response for non existing atomID properly according to isse #208	2022-09-29 10:42:32 +02:00
mpeltriaux	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	2022-09-29 10:30:06 +02:00
mpeltriaux	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	2022-09-29 10:29:33 +02:00