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
+0 −0

Conversation

chenriksson
Copy link
Member

@chenriksson chenriksson commented Aug 20, 2018 •
edited
Loading

Manual due to conflicts: git merge master -s ours

Verified with folder comparison that there are no source changes.

joelverhagen and others added 3 commits August 8, 2018 08:24
@joelverhagen
Merge branch 'dev' into master (#6266)
760a814 
Related to #6230
@zivkan
Revert email retry (#6290)
b634f27 
* 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.
@chenriksson
Merge branch 'master' into chenriks-fi-conflicts
fe4f6e9
@chenriksson chenriksson merged commit c1d08b7 into dev Aug 20, 2018
@chenriksson chenriksson deleted the chenriks-fi-conflicts branch August 20, 2018 20:10
@chenriksson chenriksson restored the chenriks-fi-conflicts branch August 20, 2018 20:15
@chenriksson chenriksson deleted the chenriks-fi-conflicts branch August 20, 2018 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joelverhagen joelverhagen joelverhagen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chenriksson @joelverhagen @zivkan