Skip to content
Snippets Groups Projects
Commit d29598e6 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge remote-tracking branch 'dev/master' 

# Conflicts:
#	Gemfile
#	Gemfile.lock
parents 5f35901a 2f825cad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 391 additions and 55 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