Skip to content
Snippets Groups Projects
Commit 4f693ec9 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge origin/master 

Conflicts:
	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents a4892097 b0d1ce53
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 202 additions and 38 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