Skip to content
Snippets Groups Projects
Commit e02ad521 authored by Zainab Almeshari's avatar Zainab Almeshari
Browse files

Merge branch 'development' into '14-as-a-user-i-want-to-view-a-list-of-all-locations-available' 

# Conflicts:
#   project_server.py
parents a66ff61b 3d233eb7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 247 additions and 191 deletions
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