Merge remote-tracking branch 'origin/master' into merge_master

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-06-07 13:56:35 -04:00
1405 changed files with 15507 additions and 14544 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
-r base.txt
Django==1.10.6
Django==1.10.7