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 lukebarnard1 commented Mar 9, 2017

Fixes #2162

lukebarnard1 pushed a commit to matrix-org/matrix-react-sdk that referenced this pull request Mar 9, 2017
Conflicts:
	src/components/views/context_menus/RoomTagContextMenu.js
Copy link
Member

@dbkr dbkr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

otherwise lgtm

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@t3chguy t3chguy deleted the luke/merge-RoomTile-context-menus branch May 12, 2022 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants