summaryrefslogtreecommitdiffstats
path: root/templates/status
diff options
context:
space:
mode:
authorJohn Olheiser <42128690+jolheiser@users.noreply.github.com>2020-02-10 17:16:31 +0100
committerGitHub <noreply@github.com>2020-02-10 17:16:31 +0100
commitb5418a64430dcd7c4ca26945d73a217ce167f62b (patch)
treeb3947787e768d3ccf6804b7280fefd132e9a0d02 /templates/status
parentOnly show conflicted files if not merged (#10197) (diff)
downloadforgejo-b5418a64430dcd7c4ca26945d73a217ce167f62b.tar.xz
forgejo-b5418a64430dcd7c4ca26945d73a217ce167f62b.zip
Changelog 1.11.0 (#10204) (#10211)
Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'templates/status')
0 files changed, 0 insertions, 0 deletions