# Conflicts:
#	nes/methods/horizontal_interpolation.py

# Conflicts:
#	nes/nc_projections/default_nes.py

Merge remote-tracking branch 'origin/develop-87-add-extra-name-options-to-the-time-variable-for-phenomena'

# Conflicts:
#	CHANGELOG.rst

Develop 94 mocage format

See merge request !116

Longitude reordering from [0, 360] to [-180, 180]

See merge request !115

comment out coordinates metadata

See merge request !114

Merge branch 'dev_develop-90-create-fake-networks-to-see-how-models-behave-in-the-future' into 'master'

Dev develop 90 create fake networks to see how models behave in the future

See merge request !112