profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into acid-chicken-patch-10

Browse source
This commit is contained in:
Acid Chicken (硫酸鶏) 2019-02-04 02:06:46 +09:00 • committed by GitHub
commit 353fc18f19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/@types/const.json.d.ts vendored Normal file
View file

@ -0,0 +1,3 @@
declare module '*/const.json' {
const copyright: string;
}

6
src/server/web/docs.ts
View file

@ -14,9 +14,9 @@ import * as glob from 'glob';
import * as yaml from 'js-yaml';
import config from '../../config';
import { licenseHtml } from '../../misc/license';
const constants = require('../../const.json');
import { copyright } from '../../const.json';
import endpoints from '../api/endpoints';
const locales = require('../../../locales');
import locales from '../../../locales';
import * as nestedProperty from 'nested-property';
function getLang(lang: string): string {
@ -59,7 +59,7 @@ async function genVars(lang: string): Promise<{ [key: string]: any }> {
vars['config'] = config;
vars['copyright'] = constants.copyright;
vars['copyright'] = copyright;
vars['license'] = licenseHtml;