sachaaaaa 0426d85e7a Merge branch 'clearnet' into multi-device ... * clearnet: (136 commits) Fix more check on deletion. Only shorten pubkeys if name is present Shorten pubkeys in quotations too better guard pass serverId back to the server Bump version. Purge cache on failure. Fix unnecessary link preview fetches. Review changes. Increase mod time to 30 seconds. Undo defaultPublicChatServer change, Modified colour of dark mod badge Linting. Updated design Show crown icon for moderators Fix last hash all being NULL in database Poll for moderators, store them on the conversation and use the list to determine our own mod status Make sure we are always updating the last deleted id Update ts/components/conversation/FriendRequest.md Fix #355 Display timestamp for friend requests Fix duplicate detection for sent messages in public chat ... # Conflicts: # app/sql.js # js/background.js # js/models/messages.js # js/views/app_view.js # libloki/crypto.js # libtextsecure/message_receiver.js		2019-09-16 15:59:40 +10:00
..
launch.json	Merge branch 'clearnet' into multi-device	2019-09-16 15:59:40 +10:00