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

merge develop into master, for 5.0.0 #311

Merged
merged 10 commits into from
Apr 28, 2020
Merged

merge develop into master, for 5.0.0 #311

merged 10 commits into from
Apr 28, 2020

Commits on Mar 31, 2020

  1. Merge pull request #307 from nytimes/master 

    merge master back into develop
    @ZevEisenberg
    ZevEisenberg authored Mar 31, 2020
    Configuration menu
    Copy the full SHA
    b98cca0 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. allow delegate to return a nil for interstitialViewAtIndex.

    @mr-fixit
    mr-fixit committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    658aa78 View commit details
    Browse the repository at this point in the history

  2. change _Nullable to nullable

    @mr-fixit
    mr-fixit committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    1c6fe9f View commit details
    Browse the repository at this point in the history

  3. tell folks to use the bootstrap script, otherwise examples don't build.

    @mr-fixit
    mr-fixit committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    52b0807 View commit details
    Browse the repository at this point in the history

  4. remove unrecognized parameter --use-submodules

    @mr-fixit
    mr-fixit committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    6d182e9 View commit details
    Browse the repository at this point in the history

  5. standardize on ObjC style of 'no space after colon'.

    @mr-fixit
    mr-fixit committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    21e49c2 View commit details
    Browse the repository at this point in the history

  6. bump version to 5.0.0

    @mr-fixit
    mr-fixit committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    017961d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #310 from nytimes/feature/allow-interstitial-views… 

    …-to-be-skipped

allow delegate to return a nil for `interstitialViewAtIndex`.
    @mr-fixit
    mr-fixit authored Apr 28, 2020
    Configuration menu
    Copy the full SHA
    3b19b80 View commit details
    Browse the repository at this point in the history

  8. style: use the right protocol name in the comment

    @mr-fixit
    mr-fixit committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    df366e5 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #312 from nytimes/chore/final-fixes-for-5.0.0 

    style: use the right protocol name in the comment
    @ZevEisenberg
    ZevEisenberg authored Apr 28, 2020
    Configuration menu
    Copy the full SHA
    21aa84d View commit details
    Browse the repository at this point in the history