fixed merge conflict #103

Merged
gansner_p merged 1 commits from dev into 61-save-catering-other-locally 2020-05-08 14:22:58 +02:00
gansner_p commented 2020-05-08 14:22:53 +02:00 (Migrated from git.psi.ch)
No description provided.
gansner_p commented 2020-05-08 14:22:58 +02:00 (Migrated from git.psi.ch)

merged

merged
gansner_p commented 2020-05-08 14:22:58 +02:00 (Migrated from git.psi.ch)

mentioned in commit 4b090939d8

mentioned in commit 4b090939d8a658c2b9c516b0501afdb2309e12e6
Sign in to join this conversation.
No Reviewers
No labels
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bb_if_produktiv/pocketapp#103