diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-01-13 13:55:05 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-01-13 13:55:05 -0300 |
commit | f2e12a56740cdf6a32695fc1a04674e6175945f7 (patch) | |
tree | c8263f6806c90c3f7271869e2c9efa0e75d7a19d /docs/dev/resources.rst | |
parent | 5b07c229c6dd507e910f1086af5706b3710f6127 (diff) | |
parent | 7f9fa030ed44a7db6ced5b359c49dadc0a781b8a (diff) |
Merge remote-tracking branch 'refs/remotes/kali/feature/import-maildir' into develop
Diffstat (limited to 'docs/dev/resources.rst')
0 files changed, 0 insertions, 0 deletions