Skip to content
Snippets Groups Projects
Commit d2639ac3 authored by David Radu's avatar David Radu
Browse files

Merge remote-tracking branch 'origin/feature-ol' into feature-ol 

# Conflicts:
#	config_model.yml
parents c5b77d33 a07f98f0
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
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