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

..

auth

Ensure that 2fa is checked on reset-password (#9857)

2020-01-19 20:17:12 +00:00

dashboard

Only show conflicted files if not merged (#10197)

2020-02-09 21:53:41 -05:00

notification

Improve notification pager (#9821)

2020-01-17 19:31:26 +01:00

settings

…

profile.tmpl

Fix followers and following tabs in profile (#10202)

2020-02-09 22:18:01 +02:00