Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-02-16 18:32:47 +00:00
commit 82ab90f007
1 changed files with 2 additions and 1 deletions

3
.gitignore vendored
View File

@ -1,7 +1,8 @@
.idea
*~
*.swp
*/vendor/*
*/vendor/bundle
*/vendor/cache
HTML
.DS_Store
coverage/