Mikunj e343a04eea Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22 ... # Conflicts: # app/sql.js # background.html # config/default.json # js/background.js # js/models/conversations.js # js/models/messages.js # js/modules/data.js # js/signal_protocol_store.js # js/views/conversation_search_view.js # libtextsecure/message_receiver.js # libtextsecure/sendmessage.js # main.js # package.json # preload.js # test/index.html # ts/components/Avatar.tsx # ts/components/conversation/ConversationHeader.md # ts/components/conversation/ConversationHeader.tsx		2019-04-17 11:59:54 +10:00
..
messages.json	Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22	2019-04-17 11:59:54 +10:00