Skip to content
Snippets Groups Projects
Commit 8135bd91 authored by Elferink, A.S. (Amber)'s avatar Elferink, A.S. (Amber)
Browse files

Merge remote-tracking branch 'origin/Anneloes' into Amber 

# Conflicts:
#	app.js
#	package-lock.json
#	package.json
#	public/libraries/jquery.min.js
#	views/partials/header.hbs
parents ccaa69d9 7da8750d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 9 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