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
..
add_reaction.tmpl	…
comments.tmpl	Automatically clear stopwatch on merging a PR (#4327)	2019-02-05 13:38:11 +02:00
pull.tmpl	Pull request conflict files detection (#5951)	2019-02-05 06:54:49 -05:00
reactions.tmpl	…
sidebar.tmpl	Feature: Archive repos (#5009)	2019-01-23 13:58:38 -05:00