Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Chris Blanchard 2016-04-16 23:19:54 +01:00
commit 2e9cdb010c

12
.gitignore vendored
View file

@ -43,4 +43,14 @@ rerun.txt
pickle-email-*.html
# Direnv
.envrc
.envrc
# Sublime
*.sublime*
# Gemtags
*.tags
*.gemtags
# Staging files
tmp/*.gz