Conflicts: modules/setting/setting.go Conflicts: templates/repo/release/list.tmpl templates/user/dashboard/dashboard.tmpl Conflicts: routers/repo/setting.go |
||
|---|---|---|
| .. | ||
| auth | ||
| dashboard | ||
| settings | ||
| issues.tmpl | ||
| profile.tmpl | ||
Conflicts: modules/setting/setting.go Conflicts: templates/repo/release/list.tmpl templates/user/dashboard/dashboard.tmpl Conflicts: routers/repo/setting.go |
||
|---|---|---|
| .. | ||
| auth | ||
| dashboard | ||
| settings | ||
| issues.tmpl | ||
| profile.tmpl | ||