Víctor Aguilera Puerto 16f0eebf15 Merge branch 'master' into 2020-08-19-firelocks ...

# Conflicts:
#	Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs
#	Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs
#	SpaceStation14.sln.DotSettings

2020-08-28 14:35:45 +02:00

..

Components

Merge branch 'master' into 2020-08-19-firelocks

2020-08-28 14:35:45 +02:00

EntitySystems

Fix parallel tests unreliably failing due to statics in Atmospherics (#1914)

2020-08-25 16:14:26 +02:00