Skip to content

Conversation

@natario1
Copy link
Contributor

@natario1 natario1 commented Mar 8, 2017

Should fix #565 .

@facebook-github-bot
Copy link

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla - and if you have received this in error or have any questions, please drop us a line at [email protected]. Thanks!

If you are contributing on behalf of someone else (eg your employer): the individual CLA is not sufficient - use https://developers.facebook.com/opensource/cla?type=company instead. Contact [email protected] if you have any questions.

@facebook-github-bot
Copy link

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks!

@rogerhu
Copy link
Contributor

rogerhu commented Mar 8, 2017

can you squash?

@natario1
Copy link
Contributor Author

natario1 commented Mar 8, 2017

@rogerhu I don’t know how. I never used git in my life. My only PRs on github are one-liners that I commit through the github editor. Is there an option to do that? Sorry.

@flovilmart
Copy link
Contributor

@rogerhu, we usually squash merge the PR's directly from here

@rogerhu rogerhu merged commit 735be49 into parse-community:master Mar 9, 2017
natario1 added a commit to natario1/Parse-SDK-Android that referenced this pull request Mar 11, 2017
commit aed49e2
Author: John <[email protected]>
Date:   Thu Mar 9 01:43:57 2017 -0600

    Remove Apache dependency to allow for higher Android target SDK. (parse-community#554)

    * Remove Apache dependency to allow for higher Android target SDK.

    * Remove ParseURLConnectionHttpClient in favor of ParseOkHttpClient

    * Add JDK specification to Travis

    * Assure the latest tools are installed

    * Update to the latest dependencies

    * Update so that the notification is built properly

commit 93dbb83
Author: Roger Hu <[email protected]>
Date:   Wed Mar 8 23:26:11 2017 -0800

    Bump to 1.14.1 snapshot

commit 5bacd08
Author: Roger Hu <[email protected]>
Date:   Wed Mar 8 17:36:50 2017 -0800

    Bump to v1.13.3 release

commit 735be49
Author: Mattia <[email protected]>
Date:   Thu Mar 9 02:34:25 2017 +0100

    Closing streams in ParseAWSRequest (parse-community#590)

    * Update ParseAWSRequest.java

commit 3fced98
Author: Florent Vilmart <[email protected]>
Date:   Wed Mar 8 20:33:32 2017 -0500

    Create .codecov.yml (parse-community#594)

commit ea489eb
Merge: 5434260 b6c98bd
Author: Roger Hu <[email protected]>
Date:   Wed Mar 8 12:15:29 2017 -0800

    Merge pull request parse-community#592 from rogerhu/1.13.3

    Bump to v1.13.3-SNAPSHOT

commit b6c98bd
Author: Roger Hu <[email protected]>
Date:   Wed Mar 8 12:14:17 2017 -0800

    Bump to v1.13.3-SNAPSHOT

commit 5434260
Merge: 64e74dc 2f2d856
Author: Roger Hu <[email protected]>
Date:   Wed Mar 8 12:10:59 2017 -0800

    Merge pull request parse-community#591 from rogerhu/1.13.2

    Bump to v1.13.2 release

commit 2f2d856
Author: Roger Hu <[email protected]>
Date:   Wed Mar 8 12:08:55 2017 -0800

    Bump to v1.13.2 release

commit 64e74dc
Merge: fe08345 f78a722
Author: Roger Hu <[email protected]>
Date:   Wed Mar 8 12:06:09 2017 -0800

    Merge pull request parse-community#506 from posativ/patch-1

    only add client key if non-null

commit f78a722
Author: Martin Zimmermann <[email protected]>
Date:   Wed Jul 27 14:29:25 2016 +0200

    only add client key if non-null
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.

CloseGuard issues

5 participants