Skip to content

Fix badly-handled conflict

Sean McGivern requested to merge make-meal-expenses-foggier into master

In resolving the conflicts in !3915 (merged), I overwrote some changes from !3735 (merged) 😞

This puts those back, and keeps the changes from !3915 (merged).

Merge request reports