Skip to content
Commit b6519ab0 authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge branch 'master' into 'current_stable_for_tests' 

shutter fix

See merge request !24
parents 7251d0ab 5101b309
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment