Merge branch 'nfp_weekend' into nfpCovid19
Conflicts: synthesis/population/spatial/secondary/locations.py
To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch
Conflicts: synthesis/population/spatial/secondary/locations.py