Commit Graph

54 Commits (6dd9dde44f7e63a1b556a062fef67b190e7fa12a)

Author SHA1 Message Date
Mikunj 3152f92e30 Merge signal 1.23.2
# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json
7 years ago
Mikunj 7387e88c97 Add showing friends in search. 7 years ago
Scott Nonnenberg 6ffbc0ac06 Archive Conversation 7 years ago
Scott Nonnenberg b3ac1373fa Move left pane entirely to React 7 years ago