# Conflicts:
#	CHANGELOG.md
#	PHILOSOPHY.md
#	doc/user/discussions/index.md
#	doc/user/project/labels.md
#	locale/gitlab.pot

[ci skip]