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

Tweaks to Riot Android & iOS TMN and FAQ #387

Merged
merged 1 commit into from Apr 20, 2020

Conversation

aaronraimist
Copy link

Signed-off-by: Aaron Raimist aaron@raim.ist

Copy link

@babolivier babolivier left a comment

Choose a reason for hiding this comment

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

Also, we might want to update the screenshot for the mobile apps, but not sure where to find ones that would fit (maybe @lampholder knows?).

content/faq/questions/q60.md Outdated Show resolved Hide resolved
@ara4n ara4n force-pushed the master branch 3 times, most recently from 5f9b81e to ca6712d Compare June 18, 2019 14:55
@aaronraimist
Copy link
Author

If I resolve the merge conflicts can this get in? It's been sitting for a while and is still needed.

@benparsons
Copy link
Member

If I resolve the merge conflicts can this get in? It's been sitting for a while and is still needed.

@aaronraimist yes please do that

Signed-off-by: Aaron Raimist <aaron@raim.ist>
@aaronraimist
Copy link
Author

Updated

Copy link
Member

@benparsons benparsons left a comment

Choose a reason for hiding this comment

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

lgtm

@benparsons benparsons merged commit 4f67c21 into matrix-org:master Apr 20, 2020
@aaronraimist aaronraimist deleted the im.vector.app branch April 21, 2020 02:54
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.

None yet

3 participants