Mikunj 8808100796 Merge signal-1.24.0 ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # background.html # config/default.json # config/production.json # js/models/conversations.js # js/models/messages.js # js/views/conversation_view.js # js/views/inbox_view.js # js/views/settings_view.js # main.js # package.json # test/index.html # ts/components/conversation/ContactName.tsx # yarn.lock		2019-04-18 12:45:19 +10:00
..
messages.json	Merge signal-1.24.0	2019-04-18 12:45:19 +10:00