Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

phpmyadmin · May 17, 2017 · 092e8d5 · 092e8d5
2 parents 550406d + 524aeae
commit 092e8d5
Show file tree

Hide file tree

Showing 87 changed files with 38,027 additions and 23,918 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         "docs": "https://docs.phpmyadmin.net/",
         "source": "https://github.com/phpmyadmin/phpmyadmin"
     },
-    "license": "GPL-2.0+",
+    "license": "GPL-2.0",
     "authors": [
         {
             "name": "The phpMyAdmin Team",