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

Create repository on organisation by default on its dashboard (#6026)

2019-02-10 13:30:25 +00:00

feeds.tmpl

Add ActionCommentPull action (#9456)

2019-12-22 08:29:26 +00:00

issues.tmpl

Only show conflicted files if not merged (#10197)

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

milestones.tmpl

Fix milestones page (#9770)

2020-01-14 22:57:13 +01:00

navbar.tmpl

add explicit dimensions to navbar avatar (#9986)

2020-01-26 18:13:38 +02:00