diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-07-24 19:15:50 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-07-24 19:15:50 +0200 |
| commit | 88db46946e31eaf4deabaaf94b818c366e74c15f (patch) | |
| tree | 95e2ac6318015163d650b6ceadae9c2c91181a74 | |
| parent | 4ad0c3e9034ca9f1d7fe12f4a36e7d1ac5180d5b (diff) | |
| parent | 941be83395122a10e363e8708267233eae041728 (diff) | |
| download | forums-88db46946e31eaf4deabaaf94b818c366e74c15f.tar forums-88db46946e31eaf4deabaaf94b818c366e74c15f.tar.gz forums-88db46946e31eaf4deabaaf94b818c366e74c15f.tar.bz2 forums-88db46946e31eaf4deabaaf94b818c366e74c15f.tar.xz forums-88db46946e31eaf4deabaaf94b818c366e74c15f.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | .jshintrc | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -19,6 +19,7 @@ "jquery": true, "globals": { - "JSON": true + "JSON": true, + "phpbb": true } } |