Skip to content
Commit a9a28aad authored by Emilio Pozuelo Monfort's avatar Emilio Pozuelo Monfort
Browse files

Merge branch 'master' into 'master' 

New upstream release: 2.0

See merge request freedesktop-team/shared-mime-info!2
parents d6d017fa e65770ab
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