Merge remote-tracking branch 'origin/master'

2016-01-17 09:25:51 +01:00 · 2016-01-17 09:25:51 +01:00 · a703c49a79
commit a703c49a79
parent a42470eb7f 0429a10426
1 changed files with 3 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -15,9 +15,11 @@
    "support": {
        "forum": "https://www.phpmyadmin.net/support/",
        "issues": "https://github.com/phpmyadmin/phpmyadmin/issues",
-        "wiki": "http://wiki.phpmyadmin.net/",
+        "wiki": "https://wiki.phpmyadmin.net/",
+        "docs": "https://docs.phpmyadmin.net/",
        "source": "https://github.com/phpmyadmin/phpmyadmin"
    },
+    "non-feature-branches": ["RELEASE_.*"],
    "require": {
        "php": ">=5.5.0"
    },