comparison web/settings.py @ 298:b0c0e88cbfcc

fix merge, update requirements
author Matt Johnston <matt@ucc.asn.au>
date Sat, 06 Jul 2019 19:10:55 +0800
parents 03e540c3ec24
children 87c20b8c5472
comparison
equal deleted inserted replaced
297:ca06059e76de 298:b0c0e88cbfcc