Merge branch 'master' into django-21
commite77a5941276e430783db4d81d5c17bb02b3edce1
authorStefan Kögl <stefan@skoegl.net>
Sat, 20 Oct 2018 14:53:55 +0000 (20 16:53 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sat, 20 Oct 2018 14:53:55 +0000 (20 16:53 +0200)
treed41df319e74ab2024f930cd8df29ecf803702a4d
parent9439f79eaca42fc9e48de06d614e2df7856c8c63
parentb34ab197c74d1efa3a47a49446e607bb0589438a
Merge branch 'master' into django-21
requirements.txt