зеркало из https://github.com/mozilla/hive-django.git
Merge branch 'master' of github.com:toolness/hive-django
Conflicts: requirements.minimal.txt
This commit is contained in:
Коммит
36622b1427
Conflicts: requirements.minimal.txt