From 7fc74eb36c0fa76cd17ec1b7fb2f8b2e6fd37dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= <daniel@klabbers.email>
Date: Wed, 4 Mar 2020 10:41:48 +0100
Subject: [PATCH] ready up for b12, updated authors, changelog

---
 .editorconfig |  2 +-
 CHANGELOG.md  |  5 +++++
 composer.json | 28 +++++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 87694dd..dc9d5b3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,5 +15,5 @@ indent_size = 2
 [*.{diff,md}]
 trim_trailing_whitespace = false
 
-[*.php]
+[*.{php,json}]
 indent_size = 4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2a5f03..ac2c4c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.1.0-beta.12](https://github.com/flarum/flarum/compare/v0.1.0-beta.8.1...v0.1.0-beta.12)
+
+### Changed
+- Consolidate site setup into shared file (#63).
+
 ## [0.1.0-beta.8.1](https://github.com/flarum/flarum/compare/v0.1.0-beta.8...v0.1.0-beta.8.1)
 
 ### Fixed
diff --git a/composer.json b/composer.json
index ef544ff..51010e0 100644
--- a/composer.json
+++ b/composer.json
@@ -2,17 +2,35 @@
     "name": "flarum/flarum",
     "description": "Delightfully simple forum software.",
     "type": "project",
-    "keywords": ["forum", "discussion"],
+    "keywords": [
+        "forum",
+        "discussion"
+    ],
     "homepage": "https://flarum.org/",
     "license": "MIT",
     "authors": [
-        {
-            "name": "Toby Zerner",
-            "email": "toby.zerner@gmail.com"
-        },
         {
             "name": "Franz Liedke",
             "email": "franz@develophp.org"
+        },
+        {
+            "name": "Daniel Klabbers",
+            "email": "daniel@klabbers.email",
+            "homepage": "https://luceos.com"
+        },
+        {
+            "name": "David Sevilla Martin",
+            "email": "me+flarum@datitisev.me",
+            "homepage": "https://datitisev.me"
+        },
+        {
+            "name": "Clark Winkelmann",
+            "email": "clark.winkelmann@gmail.com",
+            "homepage": "https://clarkwinkelmann.com"
+        },
+        {
+            "name": "Matthew Kilgore",
+            "email": "matthew@kilgore.dev"
         }
     ],
     "support": {