From f3d8d7b58f9558e6d22ed63ebe7e36be1c3d9aa8 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 2 Oct 2015 17:17:18 +0930
Subject: [PATCH] Merge flarum/server into core

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7aa35b9..dec5556 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "docs": "http://flarum.org/docs"
     },
     "require": {
-        "flarum/server": "dev-master"
+        "flarum/core": "dev-master"
     },
     "require-dev": {
         "franzl/studio": "0.10.x@dev"