Skip to content
Snippets Groups Projects
Commit adcfff9d authored by Jen Spencer's avatar Jen Spencer
Browse files

Merge branch 'master' into 'layout' 

# Conflicts:
#   app/routes.js
parents 0670c3f2 c0dcfe3f
No related branches found
No related tags found
1 merge request!36feat: add margins to content
Pipeline #6449 passed with stages
in 3 minutes and 16 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 50 additions and 66 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