]> git.lizzy.rs Git - torbrowser-launcher.git/commit
Merge branch 'french-translation' of https://github.com/tbbler/torbrowser-launcher...
authorMicah Lee <micah@micahflee.com>
Tue, 8 Jul 2014 01:13:23 +0000 (18:13 -0700)
committerMicah Lee <micah@micahflee.com>
Tue, 8 Jul 2014 01:13:23 +0000 (18:13 -0700)
commit064ae5591c86c122f5286f92c2ac7e26239786a2
tree93a027f78dd6f0b41d95d7ba1fa255109fba2d86
parenta71e3be405a5853635ce9a79c9efeb4aaf0d5d8b
parentda6bb8e30460b2350f422447796644c957ca7ad6
Merge branch 'french-translation' of https://github.com/tbbler/torbrowser-launcher into tbbler-french-translation

Conflicts:
locale/en/messages.pot
locale/en/messages.pot