* clearnet: (35 commits)
yarn lint
return early if signature is not a string
lint pass 2
lint pass 1
make sure versioning on write can't get out of sync
Update js/modules/loki_public_chat_api.js
Handle annotations omit correctly
fix typo CI found
refactor
pollOnceForMessages() move lastGot up, address Sacha's review
Update js/modules/loki_public_chat_api.js
address review
address reviews
Custom message rendering of mentions
fix method
separate out new/open, more lint/cleanup
separate out note to self
create window.mixpanel here
use window.mixpanel, remove eventEmitter
lint and remove unneeded params
...
* textsecure/master: (26 commits)
v1.21.0
v1.21.0-beta.4
Dark Theme: Preserve blue background on app loading screen
Localization updates
Fix width of audio player when window is very narrow
A number of small fixes for Link Previews
Get rid of the white flash when the app starts up (#3083)
v1.21.0-beta.3
Lint fixes
Introduce new language: NB
Fail over to all numbers in retry if errors don't have numbers
Use the proper method for pulling attachments off disk for retry
Fix rendering bug with verified state in updateVerified()
Update electron-builder and electron-updater
Ensure that dialog pops up when permissions denied for voice note
Lint fixes
Large update to localization strings
Link Previews
Ensure that blocked messages are dropped even after sealed sender
Don't linkify quoted message contents
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# _locales/cs/messages.json
# background.html
# config/default.json
# index.html
# js/models/conversations.js
# js/modules/web_api.js
# js/settings_start.js
# js/views/conversation_view.js
# js/views/settings_view.js
# package.json
# protos/SignalService.proto
# stylesheets/_index.scss
# stylesheets/_settings.scss
* add 'recipient' attribute in prekey database to allow binding a prekey to a recipient pub key
* Attach a PreKeyBundleMessage to the ContentMessage in fallback encryption mode
* Skip generating 100 prekeys upon registration
* Store the signed key signature in database
Maxim Shishmarev
sachaaaaa
Beaudan Brown
Mikunj
Ryan Tharp
Scott Nonnenberg
Bradley Sinclair
sachaaaaa