]> git.lizzy.rs Git - torbrowser-launcher.git/commitdiff
Merge branch 'master' of https://github.com/NaruTrey/torbrowser-launcher into NaruTre...
authorMicah Lee <micah@micahflee.com>
Fri, 27 Jan 2017 04:32:58 +0000 (20:32 -0800)
committerMicah Lee <micah@micahflee.com>
Fri, 27 Jan 2017 04:32:58 +0000 (20:32 -0800)
Conflicts:
share/torbrowser-launcher/locale/en/messages.pot
share/torbrowser-launcher/locale/nl_NL/messages.pot

1  2 
setup.py
torbrowser_launcher/common.py
torbrowser_launcher/launcher.py

diff --cc setup.py
Simple merge
Simple merge
Simple merge