1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-23 02:38:35 +00:00

Merged conflicts.

This commit is contained in:
Sergio Benitez
2015-09-09 13:44:51 -07:00
952 changed files with 1344 additions and 1161 deletions

View File

@@ -25,12 +25,6 @@
<div class="panel-body admin-panel">
<div class="admin-table">
<table class="table">
<thead>
<tr>
<th>{{.i18n.Tr "admin.dashboard.operation_name"}}</th>
<th>{{.i18n.Tr "admin.dashboard.operation_switch"}}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{{.i18n.Tr "admin.dashboard.clean_unbind_oauth"}}</td>
@@ -164,4 +158,4 @@
</div>
</div>
</div>
{{template "ng/base/footer" .}}
{{template "ng/base/footer" .}}