Merge remote-tracking branch 'origin/master'
Conflicts: routers/user/user.go
This commit is contained in:
commit
9bc06dc716
14 changed files with 1349 additions and 85 deletions
|
@ -3,7 +3,9 @@
|
|||
<footer id="footer">
|
||||
<div class="container footer-wrap">
|
||||
<p>© 2014 Gogs · ver {{AppVer}} ·
|
||||
<i class="fa fa-github"></i><a target="_blank" href="https://github.com/gogits/gogs">GitHub</a>
|
||||
All: {{LoadTimes .PageStartTime}} ·
|
||||
Tmpl: {{call .TmplLoadTimes}} ·
|
||||
<i class="fa fa-github"></i><a target="_blank" href="https://github.com/gogits/gogs">GitHub</a> ·
|
||||
</p>
|
||||
<p class="desc"></p>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue