Merge branch 'master' of github.com:micahflee/onionshare

This commit is contained in:
Micah Lee 2015-12-06 13:51:57 -08:00
commit 0e44621f92

View File

@ -12,6 +12,7 @@ a.datas += [
('images/server_working.png', 'images/server_working.png', 'DATA'),
('locale/de.json', 'locale/de.json', 'DATA'),
('locale/en.json', 'locale/en.json', 'DATA'),
('locale/eo.json', 'locale/eo.json', 'DATA'),
('locale/es.json', 'locale/es.json', 'DATA'),
('locale/fi.json', 'locale/fi.json', 'DATA'),
('locale/fr.json', 'locale/fr.json', 'DATA'),