Commit 1f64a341 authored by Chessmaster's avatar Chessmaster

Merge remote-tracking branch 'origin/restricted_angeltypes'

# Conflicts:
#	guide/de/what-is-an-angel.adoc
#	guide/en_US/what-is-an-angel.adoc
parents 5ce1cc9e 59551c5b
Pipeline #28227 passed with stages
in 1 minute and 3 seconds