Skip to content
Blame History Permalink
  • Tails developers's avatar
    Merge branch 'devel' into feature/unsafe_browser_name · dfd6e49a
    Tails developers authored 
    Conflicts:
	config/chroot_local-includes/usr/share/locale/ar/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/de/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/en/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/es/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/fa/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/fr/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/it/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/pt/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/ru/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/vi/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/locale/zh/LC_MESSAGES/unsafe-browser.po
	config/chroot_local-includes/usr/share/unsafe-browser/messages.pot
    dfd6e49a