Skip to content
Commit d70bb55e authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge branch 'master' into move_defaults_to_template_constructor

parents 75fd6d4f b91c6827
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