Commit graph

2 commits

Author SHA1 Message Date
anhefti
a502699774 Merge remote-tracking branch 'origin/master' into development
Conflicts:
	pom.xml
2020-12-07 16:35:57 +01:00
anhefti
606de67aa2 added static property support to GUI and fix setting gui endpoint 2020-10-06 11:50:06 +02:00