Merge branch 'master' into feature/merge_master

This commit is contained in:
Roberto Rosario
2016-03-03 16:46:11 -04:00
24 changed files with 194 additions and 181 deletions

View File

@@ -11,3 +11,5 @@ ipython==4.0.3
transifex-client==0.11
wheel==0.26.0
-r testing-base.txt