Skip to content
Snippets Groups Projects
Commit f439d86a authored by L4929's avatar L4929
Browse files

Merge branch 'development' into 'rectangle-circle-bug' 

# Conflicts:
#   src/components/DrawTools.js
parents cc62ff38 09483065
No related branches found
No related tags found
3 merge requests!21Development,!15Get game creation to user-marker-database-interactions,!12repeatMode for circle and rectangle changed to false
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