Merge branch 'release-3.0.4'

adonisjs · Jan 24, 2018 · f6b7647 · f6b7647
2 parents a32876f + 90ecfb4
commit f6b7647
Show file tree

Hide file tree

Showing 7 changed files with 933 additions and 557 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="3.0.4"></a>
+## [3.0.4](https://github.com/adonisjs/adonis-mail/compare/v3.0.3...v3.0.4) (2018-01-24)
+
+
+### Bug Fixes
+
+* **mailgun:** fix wrong driver name ([b954e41](https://github.com/adonisjs/adonis-mail/commit/b954e41))
+
+
+
 <a name="3.0.3"></a>
 ## [3.0.3](https://github.com/adonisjs/adonis-mail/compare/v3.0.2...v3.0.3) (2017-10-03)
 

diff --git a/examples/config.js b/examples/config.js
@@ -57,5 +57,29 @@ module.exports = {
     driver: 'sparkpost',
     apiKey: Env.get('SPARKPOST_API_KEY'),
     extras: {}
+  },
+
+  /*
+  |--------------------------------------------------------------------------
+  | Mailgun
+  |--------------------------------------------------------------------------
+  |
+  | Here we define configuration for mailgun. Extra options can be defined
+  | inside the `extra` object.
+  |
+  | https://mailgun-documentation.readthedocs.io/en/latest/api-sending.html#sending
+  |
+  | extras: {
+  |   'o:tag': '',
+  |   'o:campaign': '',,
+  |   . . .
+  | }
+  |
+  */
+  mailgun: {
+    driver: 'mailgun',
+    domain: Env.get('MAILGUN_DOMAIN'),
+    apiKey: Env.get('MAILGUN_API_KEY'),
+    extras: {}
   }
 }