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.

Sign up for GitHub

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

Jump to bottom

Android Studio 3.3.1 #2438

Merged
merged 1 commit into from
Feb 13, 2019
Merged

Android Studio 3.3.1 #2438

merged 1 commit into from
Feb 13, 2019

Conversation

hannesa2
Copy link
Contributor

@hannesa2 hannesa2 commented Feb 8, 2019

@hannesa2 hannesa2 force-pushed the AndroidStudio-3.3.1 branch 2 times, most recently from 315df8d to a7b289e Compare February 11, 2019 18:40
@hannesa2 hannesa2 requested a review from davigonz February 12, 2019 20:47
@hannesa2 hannesa2 force-pushed the AndroidStudio-3.3.1 branch from a7b289e to c66ec93 Compare February 13, 2019 05:57
@davigonz davigonz added this to the 2.10.0 milestone Feb 13, 2019
@davigonz davigonz requested a review from hosy February 13, 2019 16:14
@davigonz
Copy link
Contributor

davigonz commented Feb 13, 2019 •
edited
Loading

@hosy we use rebase instead of merge in this repository and the Android library one. Can you please remove the last commit and perform a rebase with master?

@hannesa2 hannesa2 force-pushed the AndroidStudio-3.3.1 branch 2 times, most recently from c66ec93 to 7fb92ac Compare February 13, 2019 16:39
@hannesa2
Copy link
Contributor Author

Ok, @hosy @davigonz I did it

Can you please remove the last commit and perform a rebase with master?

@davigonz
Copy link
Contributor

davigonz commented Feb 13, 2019 •
edited
Loading

Ok, @hosy @davigonz I did it

@hannesa2 #2402 merge triggered some conflicts

@hannesa2 hannesa2 force-pushed the AndroidStudio-3.3.1 branch from 7fb92ac to 12527b5 Compare February 13, 2019 17:49
@hannesa2
Copy link
Contributor Author

solved

@davigonz davigonz merged commit abaf2e5 into owncloud:master Feb 13, 2019
@hannesa2 hannesa2 deleted the AndroidStudio-3.3.1 branch February 13, 2019 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davigonz davigonz davigonz approved these changes

@hosy hosy hosy approved these changes

Assignees

@hannesa2 hannesa2

Labels
None yet
Projects
None yet
Milestone
2.10.0
Development

Successfully merging this pull request may close these issues.
3 participants
@hannesa2 @davigonz @hosy