Skip to content
Commit fa2556d7 authored by Alex Deryskyba's avatar Alex Deryskyba
Browse files

Merge remote-tracking branch upstream/openelec-6.0 into openelec-6.0 

Conflicts:
	config/path
parents 617005a4 6b2a4768
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