diff options
author | Jason Croft | 2016-05-12 12:32:10 -0400 |
---|---|---|
committer | Jason Croft | 2016-05-12 12:32:10 -0400 |
commit | e65d43bd81dc9af9be0c6df599800bc3ccf15a5e (patch) | |
tree | 99f23b8a7d3885ca440ae952e6034da56c9d83f5 /public/views/signin-modal.ejs | |
parent | 30e602a7400f3b38918a55f1470610b8d4ee49d7 (diff) | |
parent | 4aa4e3eacc36ae54c49ac94cf40594f33c4d9b1d (diff) |
Merge remote-tracking branch 'origin/master' into gitlab_snippets
# Conflicts:
# bower.json
# public/views/body.ejs
Diffstat (limited to '')
-rw-r--r-- | public/views/signin-modal.ejs (renamed from public/views/modal.ejs) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/public/views/modal.ejs b/public/views/signin-modal.ejs index 4eb33bf3..4eb33bf3 100644 --- a/public/views/modal.ejs +++ b/public/views/signin-modal.ejs |