Lunny Xiao bf4badad1d Pull request conflict files detection (#5951) ... * add conflict detection * test pull request conflict files * fix detection files number * fix comments		2019-02-05 06:54:49 -05:00
..
branch	…
diff	Fix wrapping long code lines in UI (#5927)	2019-02-02 16:58:28 +00:00
editor	…
issue	Pull request conflict files detection (#5951)	2019-02-05 06:54:49 -05:00
pulls	…
release	…
settings	…
wiki	…
activity.tmpl	…
branch_dropdown.tmpl	…
commit_status.tmpl	…
commits.tmpl	…
commits_table.tmpl	…
create.tmpl	…
empty.tmpl	…
forks.tmpl	…
graph.tmpl	…
header.tmpl	UI: Better support for long repo names (#5932)	2019-02-02 14:44:33 +02:00
home.tmpl	Issue 5924 fix compare button (#5929)	2019-02-03 19:56:18 -05:00
migrate.tmpl	…
search.tmpl	…
sub_menu.tmpl	…
user_cards.tmpl	…
view_file.tmpl	…
view_list.tmpl	…
watchers.tmpl	…