Skip to content
Snippets Groups Projects
Commit 1cc552bb authored by Tristan Matthews's avatar Tristan Matthews
Browse files

Merge branch 'master' into fix_conference_gnome

parents 2a0691f4 eb537558
Branches
No related tags found
No related merge requests found
Showing
with 290 additions and 357 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment