Merge branch 'master' into cleanup

This commit is contained in:
Paul Campbell 2018-08-23 23:01:58 +01:00 committed by GitHub
commit 9f1519dd34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -43,7 +43,7 @@
<javax-mail.version>1.4.7</javax-mail.version>
<subethasmtp.version>3.1.7</subethasmtp.version>
<junit.version>4.12</junit.version>
<mockito-core.version>1.10.19</mockito-core.version>
<mockito-core.version>2.21.0</mockito-core.version>
<simple-java-mail.version>3.1.1</simple-java-mail.version>
<spring-framework.version>5.0.8.RELEASE</spring-framework.version>