Merge branch 'master' into adding_ds_store_to_gitignore

This commit is contained in:
James Mason 2017-10-12 09:14:59 -07:00 committed by GitHub
commit d4492138b2

1
.gitignore vendored
View file

@ -39,3 +39,4 @@ pickle-email-*.html
docker-compose.env docker-compose.env
docker-compose.yml docker-compose.yml
.DS_Store .DS_Store
.byebug_history