(cherry picked from commit f409deabe6) (cherry picked from commit a62a3d0cf6) (cherry picked from commit a28d2ddd5e) (cherry picked from commit 2f8ac92a17) (cherry picked from commit d43c158a2f) (cherry picked from commit a2fc2dd1e2) (cherry picked from commit 00e6fa60d7) (cherry picked from commit 350f14bc8a) Conflicts: templates/user/settings/keys_gpg.tmpl templates/user/settings/keys_ssh.tmpl https://codeberg.org/forgejo/forgejo/pulls/1420 (cherry picked from commit b325b2653f) (cherry picked from commit cb5f0513f2) (cherry picked from commit 4d0fd211e0) (cherry picked from commit 91037812c3) (cherry picked from commit 636c505ad4) (cherry picked from commit 3a97587bd1) (cherry picked from commit 17cdb0ec23) (cherry picked from commit 32a4a7bb8d) (cherry picked from commit 8ef217448b) (cherry picked from commit 2c20466a3f)
f409deabe6
a62a3d0cf6
a28d2ddd5e
2f8ac92a17
d43c158a2f
a2fc2dd1e2
00e6fa60d7
350f14bc8a
b325b2653f
cb5f0513f2
4d0fd211e0
91037812c3
636c505ad4
3a97587bd1
17cdb0ec23
32a4a7bb8d
8ef217448b
2c20466a3f