5 Commits (e343a04eea722d9c53d7a68362f6f41cd7297d5d)

Author	SHA1	Message	Date
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	6 years ago
Scott Nonnenberg	a43a78731a	Note to Self	6 years ago
Mikunj	ddfc99a461	Added online indicator to conversation header.	6 years ago
Mikunj	9b382de6da	Added online indicator. ... Disable selection in contacts.	6 years ago
Scott Nonnenberg	8f3e3b7aaf	Update to new design for avatars: individual/group icons/colors ... And two initials.	7 years ago