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

Granular settings #5468

Merged
merged 8 commits into from
Nov 15, 2017
Merged

Granular settings #5468

merged 8 commits into from
Nov 15, 2017

Conversation

turt2live
Copy link
Member

Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralstron <travpc@gmail.com>
@turt2live turt2live changed the title [WIP] Granular settings Granular settings Nov 5, 2017
@ara4n
Copy link
Member

ara4n commented Nov 8, 2017

lgtm, modulo broken tests.

@turt2live
Copy link
Member Author

turt2live commented Nov 8, 2017

Tests are broken because the react side doesn't have the same branch name (oops). The tests do pass when bringing in both parts locally.

@ara4n
Copy link
Member

ara4n commented Nov 15, 2017

right, here we go!

@ara4n ara4n merged commit ffada4f into element-hq:develop Nov 15, 2017
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