Skip to content
Snippets Groups Projects
Commit 09972153 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'merge-21.0.X-2017-03-20' into '21.0'

Merge 21.0.X,rel_1 in 21.0

See merge request !497

Former-commit-id: 61df84e76578e1afb2fc9ea79d2110f259dc6511
parents d74473c3 885c2b8f
No related merge requests found
Showing
with 29 additions and 534 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment