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

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-07-29 01:55:42 -04:00
1677 changed files with 40826 additions and 21206 deletions

View File

@@ -1,2 +1,2 @@
-r base.txt
Django==1.10.7
-r base.txt