Merge with master branch

2017-03-17 14:36:00 +07:00
parent 8de9eca8ae
commit 5c0933d19a
87 changed files with 1966 additions and 1705 deletions
--- a/mailhog/Dockerfile
+++ b/mailhog/Dockerfile
@ -0,0 +1,7 @@
+FROM mailhog/mailhog
+
+Maintainer Mahmoud Zalt <mahmoud@zalt.me>
+
+CMD ["Mailhog"]
+
+EXPOSE 1025 8025