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

[ReleasePrep][2018.08.20]FI of master into dev #6331

Merged
merged 3 commits into from
Aug 20, 2018
Merged

[ReleasePrep][2018.08.20]FI of master into dev #6331

merged 3 commits into from
Aug 20, 2018

Commits on Aug 8, 2018

  1. Merge branch 'dev' into master (#6266) 

    Related to #6230
    @joelverhagen
    joelverhagen committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    760a814 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2018

  1. Revert email retry (#6290) 

    * Revert "Don't throw when SmtpUri is not set (#6278)"

This reverts commit e60e75f.

* Revert "Fix logging exceptions from background thread (#6273)"

This reverts commit d1610bb.

* Revert "Improve email sending (#6154)"

This reverts commit 2616a99.
    @zivkan
    zivkan authored Aug 9, 2018
    Configuration menu
    Copy the full SHA
    b634f27 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2018

  1. Merge branch 'master' into chenriks-fi-conflicts

    @chenriksson
    chenriksson committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    fe4f6e9 View commit details
    Browse the repository at this point in the history