Skip to content
Snippets Groups Projects
Commit f4212d59 authored by Ned Coltman's avatar Ned Coltman
Browse files

Merge branch 'cherry-pick-82253d47' into 'releases/3.2' 

Merge branch 'update/license' into 'master'

See merge request !2030
parents 19961dc2 a007db11
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 27 deletions
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