You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
4 years ago
..
auth Ensure that 2fa is checked on reset-password (#9857) 5 years ago
dashboard Only show conflicted files if not merged (#10197) 4 years ago
notification Improve notification pager (#9821) 5 years ago
settings Change some label colors (#9051) 5 years ago
profile.tmpl Fix followers and following tabs in profile (#10202) 4 years ago