Skip to content
Commit 8b3f7239 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Merge branch '5-design-your-display' into 'master' 

Resolve "Design your display"

Closes #5

See merge request ec327_projects/group7project!8
parents 49a460e8 bb09786a
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