Skip to content
Commit 72237e23 authored by Javier Marcet's avatar Javier Marcet
Browse files

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

parents d9b08a86 80f05885
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