Skip to content
Snippets Groups Projects
Commit e103b6e1 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Merge branch 'master' into 'windows_fixes'

# Conflicts:
#   lib/client.cpp
parents 8ba08819 76b506b8
No related branches found
No related tags found
Loading
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