Merge pull request #5 from matteocontrini/master

Update for beta.14
FriendsOfFlarum · Nov 25, 2020 · e64df52 · e64df52
2 parents 1445ee5 + 0fc0e2f
commit e64df52
Show file tree

Hide file tree

Showing 8 changed files with 1,502 additions and 1,687 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 vendor
 composer.lock
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
   "type": "flarum-extension",
   "license": "MIT",
   "require": {
-    "flarum/core": ">=0.1.0-beta.12 <0.1.0-beta.14"
+    "flarum/core": ">=0.1.0-beta.14 <0.1.0-beta.15"
   },
   "require-dev": {
     "phpunit/phpunit": "8.3.3"
@@ -48,7 +48,7 @@
       }
     },
     "flagrow": {
-      "discuss": ""
+      "discuss": "https://discuss.flarum.org/d/12389"
     }
   }
 }
diff --git a/js/dist/admin.js b/js/dist/admin.js
diff --git a/js/dist/admin.js.map b/js/dist/admin.js.map