Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jpollock/masheryapi
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremy committed Jun 19, 2015
2 parents 0b9fb89 + dab9574 commit 7ad88b3
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1 +1,2 @@
*.pyc
.pydevproject

0 comments on commit 7ad88b3

Please sign in to comment.