* development:
Manually set the dns servers for windows
Refactor local_loki_server
Refactor rpc calls to its own function.
# Conflicts:
# js/modules/loki_message_api.js
* commit '5c8558e293989094693f918a63b672301f1aeb55':
v1.21.1
v1.21.1-beta.1
Fix: Navigation to message via quote click didn't always work
mainWindow.close - be ready for null mainWindow
Ensure that Curve.async points to worker after startWorker call
Protect against unhandled promises when calling checkForUpdates
Reenable send when link preview is missing an image
# Conflicts:
# package.json
* 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
sachaaaaa
Beaudan Campbell-Brown
sachaaaaa
Mikunj
Scott Nonnenberg