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
..
admin	[UI] Fix admin layout	2024-07-30 23:35:22 +02:00
api/packages/pypi
base	Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3	2024-08-09 21:03:37 +02:00
custom
devtest
explore
htmx	Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3	2024-08-09 21:03:37 +02:00
mail	Merge pull request '[SEC] Notify owner about TOTP enrollment' (#4704) from gusted/sec-more-totp into forgejo	2024-07-27 20:53:47 +00:00
org	Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3	2024-08-09 21:03:37 +02:00
package	Arch packages implementation (#4785)	2024-08-04 06:16:29 +00:00
projects
repo	[PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805)	2024-08-11 19:15:37 +02:00
shared	Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3	2024-08-09 21:03:37 +02:00
status	feat(quota): Quota enforcement	2024-08-02 11:10:34 +02:00
swagger	Merge pull request '[gitea] week 2024-32 cherry pick (gitea/main -> forgejo)' (#4801) from earl-warren/wcp/2024-32 into forgejo	2024-08-06 05:47:20 +00:00
user	[UI] Fix inconsitencies in link/login account page	2024-08-09 10:52:17 +02:00
webhook
home.tmpl
install.tmpl
post-install.tmpl