Skip to content
Snippets Groups Projects
Commit 0d26d44f authored by L5047's avatar L5047
Browse files

Merge branch 'develop' into 'ABitOfEverything' 

# Conflicts:
#   wearright/src/components/bootstrap/MainCont.js
#   wearright/src/components/bootstrap/Menu.js
parents 5d4a1815 0e784cfa
Branches ABitOfEverything
No related tags found
2 merge requests!13Develop,!11A bit of everything
This commit is part of merge request !11. Comments created here will be created in the context of that merge request.
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