rekey convo list - fixup messed up merge #5658
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-waiting-for-chat-rekey
…/DESKTOP-wait-rekey-convo-list
* inbox * rekey in convo list * flow fixes
|
The commits 3707123...836a42e introduce visual changes on linux. 🔎 3 new, 3 changed
|
|
The commits 3707123...43ade7e introduce visual changes on linux. 🔎 3 new, 3 changed
|
chrisnojima
changed the title
|
The commits 3707123...56bd5db introduce visual changes on linux. 🔎 3 new, 4 changed
|
chromakode
approved these changes
Feb 3, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@keybase/react-hackers This is essentially a replacement for #5606. I had a bunch of branch off of branch and merged in a not-ideal order. So i fixed this thing up and remade it work vs master.
@chromakode already approved the previous one so if you review its mostly a sanity check. I did up the icon so the code is a tiny bit different (couple of lines)