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
..
admin
base	move clipboard.js to npm/webpack (#10183)	2020-02-08 00:03:42 +01:00
custom
explore
mail
org
pwa	move clipboard.js to npm/webpack (#10183)	2020-02-08 00:03:42 +01:00
repo	Only show conflicted files if not merged (#10197)	2020-02-09 21:53:41 -05:00
status
swagger	[API] Fix inconsistent label color format (#10129)	2020-02-09 14:33:03 +00:00
user	Only show conflicted files if not merged (#10197)	2020-02-09 21:53:41 -05:00
home.tmpl
install.tmpl