Skip to content
Commit fc6e598b authored by Tomasz Drwięga's avatar Tomasz Drwięga
Browse files

Merge branch 'master' into noui 

Conflicts:
	.travis.yml
parents 6738fe82 691e5522
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment