Commit 58ac59ed authored by sparrowhawk's avatar sparrowhawk

Merge branch 'nginx' into 'master'

nginx types

See merge request !40
parents 080197e6 735a1ddd
Pipeline #3922 passed with stages
in 2 minutes and 4 seconds