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
..
view_content
branch_selector_field.tmpl
comment_tab.tmpl
label_precolors.tmpl
labels.tmpl
list.tmpl	Only show conflicted files if not merged (#10197)	2020-02-09 21:53:41 -05:00
milestone_issues.tmpl
milestone_new.tmpl
milestones.tmpl
navbar.tmpl
new.tmpl
new_form.tmpl
search.tmpl
view.tmpl
view_content.tmpl
view_title.tmpl