Skip to content
Snippets Groups Projects
Commit 2a64d0b8 authored by Nils Christian Ehmke's avatar Nils Christian Ehmke
Browse files

Merge branch 'refs/heads/1.12' 

Conflicts:
	HISTORY
	Kieker.WebGUI/lib/kieker-1.12-SNAPSHOT_emf.LICENSE
	Kieker.WebGUI/lib/kieker-1.12_emf.LICENSE
	Kieker.WebGUI/pom.xml
	lib/kieker-1.12-SNAPSHOT_emf.LICENSE
parents ec2722c9 3fbb250e
No related branches found
No related tags found
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