mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-14 15:14:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'gitlab_snippets' of https://github.com/jccrofty30/hackmd into jccrofty30-gitlab_snippets

Browse source 
# Conflicts:
#	lib/response.js
This commit is contained in:
Cheng-Han, Wu 2016-05-15 11:02:15 +08:00
commit 8a01b7242c
8 changed files with 348 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/response.js
View file

@ -126,7 +126,11 @@ function responseHackMD(res, note) {
twitter: config.twitter,
github: config.github,
gitlab: config.gitlab,
<<<<<<< HEAD
dropbox: config.dropbox
=======
dropbox: config.dropbox,
>>>>>>> 930afdc33738a487bd9e596c5d35bc9f686eaaa1
});
var buf = html;
res.writeHead(200, {