Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2018-01-24 18:12:21 +01:00
commit 2113e998d1
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -4,7 +4,7 @@
"type": "project", "type": "project",
"keywords": ["phpbb", "forum"], "keywords": ["phpbb", "forum"],
"homepage": "https://www.phpbb.com", "homepage": "https://www.phpbb.com",
"license": "GPL-2.0", "license": "GPL-2.0-only",
"authors": [ "authors": [
{ {
"name": "phpBB Limited", "name": "phpBB Limited",