Merge branch 'master' into feature/current-status-page

silverbackhq · Sep 20, 2019 · c03af07 · c03af07
2 parents b1becea + 792da3f
commit c03af07
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
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/README.md b/README.md
@@ -47,8 +47,7 @@
 
 For transparency into our release cycle and in striving to maintain backward compatibility, Silverback is maintained under the [Semantic Versioning guidelines](https://semver.org/) and release process is predictable and business-friendly.
 
-See the [Releases section of our GitHub project](https://github.com/silverbackhq/silverback/releases) for changelogs for each release version of Silverback. It contains summaries of the most noteworthy changes made in each release.
-
+See the [Releases section of our GitHub project](https://github.com/silverbackhq/silverback/releases) for changelogs for each release version of Silverback. It contains summaries of the most noteworthy changes made in each release. Also see the [Milestones section](https://github.com/silverbackhq/silverback/milestones) for the future roadmap.
 
 ## Bug tracker
 

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