Skip to content
GitLab
Explore
Sign in
tails
tails
Repository
tails
features
torified_browsing.feature
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/devel' into feature/7976-disallow-lan-in-tor-browser
· 2efaecbe
intrigeri
authored
Jul 01, 2015
Conflicts: features/step_definitions/common_steps.rb features/torified_browsing.feature
2efaecbe