Skip to content
  • anonym's avatar
    Merge remote-tracking branch 'origin/devel' into feature/jessie · a2fd0ea3
    anonym authored
    Conflicts:
    	features/images/I2P_router_console.png
    	features/images/TailsInstallerNoDevice.png
    	features/images/TorBrowserAddressBar.png
    	features/images/USBSuggestsInstall.png
    	features/images/UnsafeBrowserAdvancedSettings.png
    	features/images/UnsafeBrowserEditPreferences.png
    	features/images/UnsafeBrowserProxyRefused.png
    	features/images/UnsafeBrowserWindow.png
    	features/step_definitions/unsafe_browser.rb
    a2fd0ea3