You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

sachaaaaa 33ad509fbf Merge branch 'master' of https://github.com/signalapp/Signal-Desktop into development ... # Conflicts: # _locales/ar/messages.json # _locales/es_419/messages.json # _locales/he/messages.json # _locales/hi/messages.json # _locales/hr/messages.json # _locales/kn/messages.json # _locales/ko/messages.json # _locales/mk/messages.json # _locales/sr/messages.json # _locales/uk/messages.json # _locales/vi/messages.json # package.json		7 years ago
..
messages.json	Merge branch 'master' of https://github.com/signalapp/Signal-Desktop into development	7 years ago