Merge branch 'add-ftps-sender' of github.com:liberation/django-carrie…

…r-pigeon into add-ftps-sender
nahuelange · Apr 2, 2014 · 0b8e1bf · 0b8e1bf
2 parents fca3623 + cb5b55b
commit 0b8e1bf
Show file tree

Hide file tree

Showing 3 changed files with 1,052 additions and 2 deletions.
diff --git a/carrier_pigeon/lib/__init__.py b/carrier_pigeon/lib/__init__.py