Skip to content
This repository has been archived by the owner on May 2, 2022. It is now read-only.

Mepa1363 canada fixes and ops #542

Merged
merged 5 commits into from
Apr 4, 2020
Merged

Conversation

fossecode
Copy link
Member

@fossecode fossecode commented Apr 4, 2020

@mepa1363 merged some other stuff that caused even more conflicts, so I just fixed the merge conflicts locally. Closes #492

@fossecode fossecode merged commit 3b96a6d into master Apr 4, 2020
@fossecode fossecode deleted the mepa1363-canada-fixes-and-ops branch April 4, 2020 11:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants