Merge branch 'pull/2484'

BardoQi · Jan 13, 2019 · 287be75 · 287be75
2 parents 1013805 + f652cae
commit 287be75
Show file tree

Hide file tree

Showing 70 changed files with 2,173 additions and 1,788 deletions.
diff --git a/composer.json b/composer.json
@@ -21,11 +21,11 @@
         "ozh/bookmarkletgen": "1.2",
         "ozh/phpass": "1.2.0",
         "rmccue/Requests" : "1.7",
-        "pomo/pomo" : "1.3.0",
-        "geoip2/geoip2" : "2.5.0",
+        "pomo/pomo" : "1.4.1",
+        "geoip2/geoip2" : "2.9.0",
         "aura/sql": "~2.",
         "jakeasmith/http_build_url": "1.0.1",
-        "symfony/polyfill-mbstring": "1.5.0"
+        "symfony/polyfill-mbstring": "1.10.0"
     },
     "config": {
         "vendor-dir": "includes/vendor"
@@ -38,5 +38,8 @@
     "suggest": {
         "ext-mbstring": "For best performance",
         "ext-curl": "Required for API usage"
+    },
+    "scripts": {
+        "post-update-cmd": "bash ./includes/vendor/build-script/yourls-build.sh ./includes/vendor"
     }
 }
diff --git a/composer.lock b/composer.lock