Skip to content
Snippets Groups Projects
Commit 3cc95353 authored by Holger Just's avatar Holger Just
Browse files

Merge commit '873b2b69' 

Conflicts:
	config/locales/nl.yml
parents 917c36c2 873b2b69
Branches
Tags v2.0.0
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 16 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