Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge the two RoomTile context menus into one #3395

Merged
merged 3 commits into from Mar 14, 2017

Conversation

@lukebarnard1
Copy link
Contributor

lukebarnard1 commented Mar 9, 2017

Fixes #2162

lukebarnard1 added a commit to matrix-org/matrix-react-sdk that referenced this pull request Mar 9, 2017
This will require riot-web changes vector-im/riot-web#3395
Conflicts:
	src/components/views/context_menus/RoomTagContextMenu.js
Copy link
Member

dbkr left a comment

otherwise lgtm

@@ -0,0 +1,404 @@
/*
Copyright 2015, 2016 OpenMarket Ltd

This comment has been minimized.

Copy link
@dbkr

dbkr Mar 14, 2017

Member

probably need to add vector here

@dbkr dbkr assigned lukebarnard1 and unassigned dbkr Mar 14, 2017
@lukebarnard1 lukebarnard1 merged commit 1ade7a7 into develop Mar 14, 2017
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.