Merge remote-tracking branch 'origin/dev-1.1-patch-1' into development

Browse source

Conflicts:
	pom.xml

...

This commit is contained in:

anhefti 2021-03-31 16:18:05 +02:00

parent edabeeda37 5b0d99d475

commit 804911e3b8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available