Skip to content
Commit 6b0cc0c8 authored by Tomusdrw's avatar Tomusdrw
Browse files

Merge branch 'master' into close_gently 

Conflicts:
	parity/main.rs
parents 2a498fc3 9f8766c8
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