Merge branch 'master' into django-1.10
commit77e6d9f85fce1fa1f6f0c81834f861a053bc14a2
authorStefan Kögl <stefan@skoegl.net>
Fri, 23 Jun 2017 18:30:45 +0000 (23 14:30 -0400)
committerStefan Kögl <stefan@skoegl.net>
Fri, 23 Jun 2017 18:30:45 +0000 (23 14:30 -0400)
tree0e2675da012b9c8af477afe0a537c4e510ba6a74
parentcecf783aed7fa4ef84c504e2aba543aa51a2a881
parentc50f2fa23e50d5ff87603bab4ea8882631579ba0
Merge branch 'master' into django-1.10
mygpo/usersettings/migrations/0001_initial.py
requirements.txt