Skip to content
Commit 918f7e12 authored by role-branch-merger's avatar role-branch-merger
Browse files

Merge branch 'master' into 'stable' 

Merge branch 'master' into 'stable'

See merge request tails/tails!1686
parents a7017c76 d947084f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment