Conflicts: modules/setting/setting.go Conflicts: templates/repo/release/list.tmpl templates/user/dashboard/dashboard.tmpl Conflicts: routers/repo/setting.go |
||
|---|---|---|
| .. | ||
| members.go | ||
| org.go | ||
| setting.go | ||
| teams.go | ||
Conflicts: modules/setting/setting.go Conflicts: templates/repo/release/list.tmpl templates/user/dashboard/dashboard.tmpl Conflicts: routers/repo/setting.go |
||
|---|---|---|
| .. | ||
| members.go | ||
| org.go | ||
| setting.go | ||
| teams.go | ||