Infrastructure/forgejo
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 15:23:14 -05:00
Code Issues Activity
forgejo/options
History
a1012112796 e5f8d144f2
[PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805) 
---

Conflict resolution: trivial
Things done differently: Improve localization message, use the paragraph
element instead of the div element, fix passing this variable to the
template and add a integration test

(cherry picked from commit 9633f336c87947dc7d2a5e76077a10699ba5e50d)
2024-08-11 19:15:37 +02:00
..
gitignore [skip ci] Updated licenses and gitignores 2024-06-23 10:37:24 +02:00
label Add missing exclusive in advanced label options (#28322) 2024-01-22 07:56:17 +00:00
license [skip ci] Updated licenses and gitignores 2024-06-02 09:03:10 +02:00
locale [PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805) 2024-08-11 19:15:37 +02:00
readme