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

Add vector-specific branded components #453

Merged
merged 6 commits into from
Dec 2, 2015
Merged

Conversation

kegsay
Copy link
Contributor

@kegsay kegsay commented Dec 1, 2015

These clobber the generic branded components in matrix-react-sdk with vector branded ones.

See matrix-org/matrix-react-sdk#44 for the related PR.

@kegsay kegsay added the T-Task Tasks for the team like planning label Dec 1, 2015
@dbkr
Copy link
Member

dbkr commented Dec 1, 2015

Sorry, I've made this not merge by merging my skindexing stuff. I'll go fix this...

Update having merged skindexing PR
@dbkr
Copy link
Member

dbkr commented Dec 1, 2015

lgtm, and I've updated for new skindex stuff.

@dbkr dbkr assigned kegsay and unassigned dbkr Dec 1, 2015
@dbkr
Copy link
Member

dbkr commented Dec 1, 2015

I'll let you do a final check of this & merge it.

Conflicts:
	src/component-index.js
kegsay added a commit that referenced this pull request Dec 2, 2015
Add vector-specific branded components
@kegsay kegsay merged commit 6db1151 into develop Dec 2, 2015
@t3chguy t3chguy deleted the kegan/vector-references branch May 12, 2022 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T-Task Tasks for the team like planning
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants