* 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
* 'master' of https://github.com/signalapp/Signal-Desktop: (38 commits)
v1.17.0
v1.17.0-beta.4
Ensure that blue group avatars are preserved in dark theme
Android theme: Incoming quotes take color from containing message
Conversations have blue avatar backgrounds if no image provided
Fix lint errors
Add ca language
inboxView: Ensure Conversation exists for our own number
Ensure that file is not attached if we've filtered it
v1.17.0-beta.3
Localization updates
v1.16.3
Lint fixes
Lint fixes
Better handle large numbers of messages in cache on startup
Keep object stores after conversations migrate to SQLCipher
Longer timeout for orphaned file cleanup
Tests and increase consistency for isFileDangerous calls
Longer timeout for orphaned file cleanup
v1.17.0-beta.2
...
# Conflicts:
# background.html
# package.json
sachaaaaa
Scott Nonnenberg
Mikunj