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

Fixes #633: Remove ActionSheetProvider from root in the chat.js #634

Merged
merged 1 commit into from May 25, 2017

Conversation

Projects
None yet
4 participants
@kunall17
Copy link
Contributor

kunall17 commented May 25, 2017

simulator screen shot 24-may-2017 7 11 30 pm

@smarx

This comment has been minimized.

Copy link

smarx commented May 25, 2017

Automated message from Dropbox CLA bot

@kunall17, it looks like you've already signed the Dropbox CLA. Thanks!

@borisyankov

This comment has been minimized.

Copy link
Contributor

borisyankov commented May 25, 2017

Looks OK. Rebase, please.

@zulipbot

This comment has been minimized.

Copy link
Member

zulipbot commented May 25, 2017

Heads up @kunall17, we just merged some commits (latest: d1bc5e9) that conflict with the changes your made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the upstream/master branch and resolve your pull request's merge conflicts accordingly.

@kunall17 kunall17 force-pushed the kunall17:patch-8 branch from b8d864b to c52881f May 25, 2017

@kunall17

This comment has been minimized.

Copy link
Contributor Author

kunall17 commented May 25, 2017

Done

@borisyankov borisyankov merged commit ef89570 into zulip:master May 25, 2017

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

@zulipbot zulipbot removed the needs review label May 25, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.