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

Merge branch 'development' into... 

Merge branch 'development' into '13-as-a-moderator-i-want-to-be-able-to-amend-and-remove-existing-locations-spaces-features'

# Conflicts:
#   project_server.py
parents 97c081c0 119ae108
No related branches found
No related tags found
1 merge request!45Resolve "As a moderator, I want to be able to amend (and remove) existing locations/spaces/features."
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment