Merge branch 'django-1.10' into pg-search
commit2bdd35e04e9c2965430dc195d56c1a1fd7a4777f
authorStefan Kögl <stefan@skoegl.net>
Sat, 22 Jul 2017 17:36:22 +0000 (22 19:36 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sat, 22 Jul 2017 17:36:22 +0000 (22 19:36 +0200)
tree7b051fd905862b6d1c11c1c6be765ea61b6eaf64
parentf3def760eaddf33ae53502d089ca52dfe731308e
parent1063616f4713190ba6fd7693dee6825f4c29beb5
Merge branch 'django-1.10' into pg-search