Merge branch 'master' into bugfix/validation

silverbackhq · Sep 20, 2019 · e9371f5 · e9371f5
2 parents bac8da9 + 792da3f
commit e9371f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,6 +6,7 @@
   - Review existing issues and provide feedback or react to them.
 
 - With pull requests:
+  - We follow [Google Python Style Guide](http://google.github.io/styleguide/pyguide.html).
   - Open your pull request against `master` or `develop` if exists.
   - Your pull request should have no more than two commits, if not you should squash them.
   - It should pass all tests in the available continuous integrations systems such as TravisCI.

diff --git a/requirements.txt b/requirements.txt
@@ -9,7 +9,7 @@ celery==4.3.0
 redis==3.3.8
 cryptography==2.7
 markdown2==2.3.8
-twilio==6.30.0
+twilio==6.31.0
 pyumetric==0.0.4
 pyvalitron==1.1.3
 feedgen==0.8.0