sa6anw/hedgedoc-hedgeagent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent 30e602a740 4aa4e3eacc
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 %>