Commit daf03281 authored by Michael Schimpelsberger's avatar Michael Schimpelsberger
Browse files

Merge branch 'dev-franz' into 'master'

Client: Removed code at the moment. Version to 1.2.0

See merge request !5
parents c5fa1b7a b83000b2
......@@ -6,7 +6,7 @@
Subproject commit 7643a1ebb62b10eaf9d2c528381d0bd8df35e628
Subproject commit cf2367505bfaee364d10e55339610a9ed84bb16d
Markdown is supported
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