diff options
| author | Azul <azul@riseup.net> | 2016-10-20 14:39:33 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-10-20 14:39:33 +0200 |
| commit | b97daaed9b513006ace7e8eb5232a2211e965e77 (patch) | |
| tree | e27002e8368e92410e5d4af2a945260c2ea6e2d1 /config/defaults.yml | |
| parent | c6c4d9fd10b8ca8e24889112727e44c9bf68dd60 (diff) | |
| parent | 6eb2dae802e5453e2a4361ab28f614cce9294f4c (diff) | |
Merge remote-tracking branch 'origin/develop'
We'll only use the master branch for development from now on.
Diffstat (limited to 'config/defaults.yml')
| -rw-r--r-- | config/defaults.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/defaults.yml b/config/defaults.yml index 844adaa..7e2ea58 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -87,6 +87,7 @@ common: &common soledad-service: 'public/1/config/soledad-service.json' eip-service: 'public/1/config/eip-service.json' smtp-service: 'public/1/config/smtp-service.json' + provider: 'config/provider/provider.json' mailer: from_address: 'noreply' |