diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-04-01 19:57:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-01 19:57:36 +0900 |
| commit | fabda94932ebdd012b0772ce1e63ac515f546d84 (patch) | |
| tree | 1c5ffb9d42ebdb9f1830b331d3c1611b8ebc13ae /src/server/index.ts | |
| parent | fix(package): update html-minifier to version 3.5.13 (diff) | |
| parent | Merge pull request #1354 from syuilo/greenkeeper/bootstrap-vue-2.0.0-rc.4 (diff) | |
| download | misskey-fabda94932ebdd012b0772ce1e63ac515f546d84.tar.gz misskey-fabda94932ebdd012b0772ce1e63ac515f546d84.tar.bz2 misskey-fabda94932ebdd012b0772ce1e63ac515f546d84.zip | |
Merge branch 'master' into greenkeeper/html-minifier-3.5.13
Diffstat (limited to 'src/server/index.ts')
| -rw-r--r-- | src/server/index.ts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/index.ts b/src/server/index.ts index fe22d9c9b3..1874790116 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -9,6 +9,8 @@ import * as express from 'express'; import * as morgan from 'morgan'; import Accesses from 'accesses'; +import activityPub from './activitypub'; +import webFinger from './webfinger'; import log from './log-request'; import config from '../conf'; @@ -53,6 +55,8 @@ app.use((req, res, next) => { */ app.use('/api', require('./api')); app.use('/files', require('./file')); +app.use(activityPub); +app.use(webFinger); app.use(require('./web')); function createServer() { |