Skip to content
Snippets Groups Projects
Commit ba4842f4 authored by Tamara Vazquez Schroeder's avatar Tamara Vazquez Schroeder
Browse files

Merge remote-tracking branch 'upstream/21.0-mc16d' into better_merge-mc16d-into-21.0

parents 1a43b2dc efaa68e6
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 367 additions and 580 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