Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame
2016-03-17 21:06:54 +09:00
1140 changed files with 179704 additions and 179635 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ declare module 'highlight.js' {
export = hljs;
}
declare module hljs
declare namespace hljs
{
export function highlight(
name: string,