Skip to content
Snippets Groups Projects
Commit 43756f40 authored by Armin Felder's avatar Armin Felder
Browse files

Merge branch 'fairchat-master' into mergerMasterFairchat

parents 494890ad 434ca865
1 merge request!11Merger master fairchat
Showing
with 7 additions and 7 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment