Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander 2016-07-24 19:15:50 +02:00
commit 88db46946e

View file

@ -19,6 +19,7 @@
"jquery": true,
"globals": {
"JSON": true
"JSON": true,
"phpbb": true
}
}