1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00

Merge remote-tracking branch 'origin/master'

Conflicts:
	routers/user/user.go
This commit is contained in:
FuXiaoHei
2014-03-19 22:19:17 +08:00
13 changed files with 83 additions and 369 deletions

View File

@@ -3,9 +3,7 @@
<footer id="footer">
<div class="container footer-wrap">
<p>© 2014 Gogs · ver {{AppVer}} ·
All: {{LoadTimes .PageStartTime}} ·
Tmpl: {{call .TmplLoadTimes}} ·
<i class="fa fa-github"></i><a target="_blank" href="https://github.com/gogits/gogs">GitHub</a> ·
<i class="fa fa-github"></i><a target="_blank" href="https://github.com/gogits/gogs">GitHub</a>
</p>
<p class="desc"></p>
</div>