Skip to content
Snippets Groups Projects
Commit ab50b6b8 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch 'master' into '178-flying-team-management-page'

# Conflicts:
#   smash/web/forms/forms.py
parents d9e2af58 143dba58
No related branches found
No related tags found
1 merge request!118Resolve "Flying team location management site"
Pipeline #
Showing
with 488 additions and 32 deletions
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