Skip to content
Commit facd706d authored by Björn Richerzhagen's avatar Björn Richerzhagen
Browse files

Merge branch 'br/a1-master-merge' into 'master' 

Br/a1 master merge

(As discussed during the MAKI BarCamp 2016)

See merge request !26
parents f6e37288 35c01c75
Expand all Hide whitespace changes
Inline Side-by-side
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