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

Merge remote-tracking branch 'origin/master' into gitlab_snippets

Browse source 
# Conflicts:
#	bower.json
#	public/views/body.ejs
This commit is contained in:
Jason Croft 2016-05-12 12:32:10 -04:00
commit e65d43bd81
10 changed files with 149 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
public/views/body.ejs
View file

@ -234,4 +234,5 @@
</div>
</div>
</div>
<%- include modal %>
<%- include signin-modal %>
<%- include help-modal %>