Merge flarum/server into core

pull/25/head
Toby Zerner 2015-10-02 17:17:18 +09:30
parent 3a0d8a656a
commit f3d8d7b58f
1 changed files with 1 additions and 1 deletions

View File

@ -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"