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>		5 years ago
..
dashboard.tmpl	Create repository on organisation by default on its dashboard (#6026)	6 years ago
feeds.tmpl	Add ActionCommentPull action (#9456)	5 years ago
issues.tmpl	Only show conflicted files if not merged (#10197)	5 years ago
milestones.tmpl	Fix milestones page (#9770)	5 years ago
navbar.tmpl	add explicit dimensions to navbar avatar (#9986)	5 years ago