[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma] / lib / pleroma / web / templates /
drwxr-xr-x   ..
drwxr-xr-x - layout
drwxr-xr-x - mastodon_api
drwxr-xr-x - o_auth
drwxr-xr-x - twitter_api