Merge branch 'release/4.0' into dev

Conflicts:
	lib/open_project/version.rb
pull/2159/head
Jens Ulferts 10 years ago
commit 85c4f3ddce

Diff Content Not Available