You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
default.json	Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22	7 years ago
development-1.json	Removed online broadcast message type, changed ttl logic a little, add p2p address and port to the window object when recieve message	7 years ago
development.json	Load test page and run tests on start when NODE_ENV=test	8 years ago
production.json	lint haha	7 years ago
staging.json	Load test page and run tests on start when NODE_ENV=test	8 years ago
test-lib.json	Save prekeys optimistically, track confirms, new clean behavior (#1846)	8 years ago
test.json	Eliminate HIDE_DEV_TOOLS environment variable. Hide in test env.	8 years ago