diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-06-27 00:55:44 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-27 00:55:44 +0900 |
| commit | 9ac34badad7a99166907e1a42f8a817413a74d58 (patch) | |
| tree | eb45b75f1f5f87a36f0eefec42f449fda109a6ad /src/server/api | |
| parent | New translations ja.yml (Portuguese) (diff) | |
| parent | Merge pull request #1789 from syuilo/greenkeeper/uuid-3.3.0 (diff) | |
| download | misskey-9ac34badad7a99166907e1a42f8a817413a74d58.tar.gz misskey-9ac34badad7a99166907e1a42f8a817413a74d58.tar.bz2 misskey-9ac34badad7a99166907e1a42f8a817413a74d58.zip | |
Merge branch 'master' into l10n_master
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/endpoints.ts | 3 | ||||
| -rw-r--r-- | src/server/api/index.ts | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/server/api/endpoints.ts b/src/server/api/endpoints.ts index a5d13b0237..f613710c80 100644 --- a/src/server/api/endpoints.ts +++ b/src/server/api/endpoints.ts @@ -629,8 +629,7 @@ const endpoints: Endpoint[] = [ }, { - name: 'hashtags/trend', - withCredential: true + name: 'hashtags/trend' }, { diff --git a/src/server/api/index.ts b/src/server/api/index.ts index c39911c35f..004c21b821 100644 --- a/src/server/api/index.ts +++ b/src/server/api/index.ts @@ -45,7 +45,6 @@ router.post('/signin', require('./private/signin').default); router.use(require('./service/github').routes()); router.use(require('./service/twitter').routes()); -router.use(require('./bot/interfaces/line').routes()); // Register router app.use(router.routes()); |