zeripath 9789e0ad53

Only show conflicted files if not merged (#10197) ...

* Only show conflicted files if not merged

* try again

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: techknowlogick <matti@mdranta.net>

2020-02-09 21:53:41 -05:00

..

dashboard.tmpl

…

feeds.tmpl

…

issues.tmpl

Only show conflicted files if not merged (#10197)

2020-02-09 21:53:41 -05:00

milestones.tmpl

…

navbar.tmpl

…