Skip to content
Snippets Groups Projects
Commit 7bc3ca77 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' into conference

parents 099b0a0f 8ef29ee6
Branches
No related tags found
No related merge requests found
Showing
with 245 additions and 425 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment