1
1
mirror of https://github.com/go-gitea/gitea synced 2025-08-06 09:38:21 +00:00

Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2

# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css
This commit is contained in:
Unknwon
2015-08-10 23:01:41 +08:00
12 changed files with 143 additions and 78 deletions

View File

@@ -4,7 +4,7 @@
<a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.RepoLink}}/settings">
{{.i18n.Tr "repo.settings.options"}}
</a>
<a class="{{if .PageIsSettingsCollaboration}}active{{end}} item" href="{.RepoLink}}/settings/collaboration">
<a class="{{if .PageIsSettingsCollaboration}}active{{end}} item" href="{{.RepoLink}}/settings/collaboration">
{{.i18n.Tr "repo.settings.collaboration"}}
</a>
<a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks">
@@ -17,4 +17,4 @@
{{.i18n.Tr "repo.settings.deploy_keys"}}
</a>
</div>
</div>
</div>