Skip to content
Snippets Groups Projects
Commit 2f32a9cc authored by Jeff Forcier's avatar Jeff Forcier
Browse files

Merge branch '2.1' into 2.2

parents 023efd0e bcdf37ea
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 4 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