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

JsonFile::__toString() - detect json_encode failure #263

Merged
merged 3 commits into from
May 22, 2018
Merged

JsonFile::__toString() - detect json_encode failure #263

merged 3 commits into from
May 22, 2018

Commits on May 16, 2018

  1. JsonFile::__toString() - detect json_encode failure

    @keradus
    keradus committed May 16, 2018
    Configuration menu
    Copy the full SHA
    57cbc63 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2018

  1. Merge remote-tracking branch 'upstream/2.1' into 2.0_193

    @keradus
    keradus committed May 22, 2018
    Configuration menu
    Copy the full SHA
    e09a8f7 View commit details
    Browse the repository at this point in the history

  2. fix CS

    @keradus
    keradus committed May 22, 2018
    Configuration menu
    Copy the full SHA
    e6de987 View commit details
    Browse the repository at this point in the history