Skip to content
Snippets Groups Projects
Commit c4d84a05 authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Merge branch 'Merge21.0Into21.2-21.2-20170818' into '21.2'

Merge 21.0 into 21.2, 21.2 branch (2017.08.18.)

See merge request !4120

Former-commit-id: 5aba5859a40395d76b2826303668bbf6d4b2a0ce
parents 11333d5b bfcbc617
No related branches found
No related tags found
No related merge requests found
Showing
with 2894 additions and 2832 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