Skip to content
Snippets Groups Projects
Commit c76795c2 authored by Liam Driscoll's avatar Liam Driscoll
Browse files

Merge conflict resolution.

parents 10b883cd 447d1e30
No related branches found
No related tags found
2 merge requests!45Resolve "As a moderator, I want to be able to amend (and remove) existing locations/spaces/features.",!44Updating functions.
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment