diff options
| author | Kali Kaneko <kali@leap.se> | 2013-08-05 03:46:36 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-08-05 03:46:36 +0200 |
| commit | bb01912dd4dfe05f16d1c2fa716346ca358f5d04 (patch) | |
| tree | b3a910bcb586f3af964afaa5e61f75a4701df11f /data/resources | |
| parent | d2d13cf61adf51895d45556ab0b08115ea2eeb1c (diff) | |
| parent | dbb8b11eab30d495492bd7f65430fb9c25e3a276 (diff) | |
Merge remote-tracking branch 'chiiph/feature/re-integrate-smtp' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions