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
..
branch	Fix branch page pull request title and link error (#10092)	2020-02-01 15:54:25 +02:00
diff	fix commit view JS features, reimplement folding (#9968)	2020-01-26 08:17:25 +00:00
editor
issue	Only show conflicted files if not merged (#10197)	2020-02-09 21:53:41 -05:00
pulls
release	Show download count info in release list (#10124)	2020-02-03 21:50:37 +02:00
settings
wiki
activity.tmpl	Add top author stats to activity page (#9615)	2020-01-20 12:07:30 +02:00
blame.tmpl
branch_dropdown.tmpl
commit_page.tmpl
commit_status.tmpl
commits_list.tmpl
commits_table.tmpl
commits.tmpl
create.tmpl
empty.tmpl
forks.tmpl
graph.tmpl
header.tmpl	Sanitize credentials in mirror form (#9975)	2020-01-25 10:57:42 +00:00
home.tmpl
migrate.tmpl
migrating.tmpl
search.tmpl
sub_menu.tmpl
user_cards.tmpl	Fix followers and following tabs in profile (#10202)	2020-02-09 22:18:01 +02:00
view_file.tmpl
view_list.tmpl
watchers.tmpl