diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
| commit | bf96cfa0d75d256e036c76ec64f0f456014f2739 (patch) | |
| tree | 3ab0ff603dfccb9f28040af3a1559b01af09aa3f /framework/mail/mailplugin.cpp | |
| parent | e4e11ba46f4ccce5f9ca63ab758a132d945061e8 (diff) | |
| parent | 9a3059769a0bf9dbf81e523c9245d2aa98420bb5 (diff) | |
| download | kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.tar.gz kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.zip | |
Merge remote-tracking branch 'origin/dev/libotp' into develop
Conflicts:
framework/mail/CMakeLists.txt
Diffstat (limited to 'framework/mail/mailplugin.cpp')
0 files changed, 0 insertions, 0 deletions