1
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-23 21:34:43 +03:00
gitea/templates
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 Remove unused config on UI (#10078) 2020-01-31 00:18:31 +02:00
base move clipboard.js to npm/webpack (#10183) 2020-02-08 00:03:42 +01:00
custom Add footer extra links template (#9576) 2020-01-03 20:41:56 +02:00
explore Repository avatar fallback configuration (#7087) 2019-06-02 14:40:12 +08:00
mail Style blockquote for default issue mail template (#10024) 2020-01-27 22:35:34 +00:00
org Add setting to set default and global disabled repository units. (#8788) 2020-01-17 09:34:37 +02:00
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 [assets] configurable URL for static resources (#7911) 2019-10-22 20:11:01 +08:00
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 [assets] configurable URL for static resources (#7911) 2019-10-22 20:11:01 +08:00
install.tmpl Add support for database schema in PostgreSQL (#8819) 2020-01-20 16:45:14 +01:00