Skip to content

Commit

Permalink
Merge branch 'main' into dev-3.x
Browse files Browse the repository at this point in the history 
This is a manual merge commit to keep track of where main was merge as I
forgot to use the "merge" option in git and squashed instead
  • Loading branch information
@martinbonnin
martinbonnin committed Dec 23, 2020
2 parents d59f2a1 + 727abad commit 83ec9f8
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 83ec9f8

Please sign in to comment.