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

Conversation

@turt2live
Copy link
Member

turt2live commented Oct 29, 2017

Signed-off-by: Travis Ralston <travpc@gmail.com>
@turt2live turt2live referenced this pull request Oct 29, 2017
15 of 15 tasks complete
turt2live added 4 commits Oct 29, 2017
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

This comment has been minimized.

Copy link
Member

ara4n commented Nov 8, 2017

lgtm, modulo broken tests.

@turt2live

This comment has been minimized.

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.

turt2live added 3 commits Nov 13, 2017
Signed-off-by: Travis Ralston <travpc@gmail.com>
@ara4n

This comment has been minimized.

Copy link
Member

ara4n commented Nov 15, 2017

right, here we go!

@ara4n ara4n merged commit ffada4f into vector-im:develop Nov 15, 2017
1 check failed
1 check failed
continuous-integration/travis-ci/pr The Travis CI build failed
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.