Skip to content
GitLab
Explore
Sign in
tails
tails
Repository
tails
..
i2p-browser
prefs.js
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/stable' into bugfix/8159-fix-download-management-page
· 6734c9f1
anonym
authored
Sep 16, 2015
Conflicts: config/chroot_local-includes/usr/share/tails/i2p-browser/prefs.js
6734c9f1