Merge branch 'master' into static-media
commit8e9f6379a33cbf24d0572a8848e4d45f22d405e4
authorStefan Kögl <stefan@skoegl.net>
Sat, 2 Dec 2017 19:54:58 +0000 (2 20:54 +0100)
committerStefan Kögl <stefan@skoegl.net>
Sat, 2 Dec 2017 19:54:58 +0000 (2 20:54 +0100)
treee8c9612293f66389ae2fda057363c0baa5ae3bf5
parentdcd07ce9fa3eac1420c349047913d7639b2de05c
parent41128acdcc12fcc6f3c6b9e1f6891146226d78d0
Merge branch 'master' into static-media
.gitignore
makefile
mygpo/settings.py