Merge branch 'main' into origin/fix_static_links_when_https_disabled

This commit is contained in:
analogue 2022-03-29 22:24:56 +02:00
commit 9b6dec1108
2 changed files with 9 additions and 4 deletions

View File

@ -41,6 +41,8 @@ Community instances:
| [teddit.totaldarkness.net](https://teddit.totaldarkness.net) | | | |
| [teddit.adminforge.de](https://teddit.adminforge.de) | | | Operated by https://adminforge.de |
| [teddit.bus-hit.me](https://teddit.bus-hit.me) | | | Operated by https://bus-hit.me |
| [teddit.froth.zone](https://teddit.froth.zone) | | | |
| [rdt.trom.tf](https://teddit.froth.zone) | | | Part of the https://trom.tf project |
<!--
Remove the Changelog section, because the CHANGELOG.md is not updated anymore
## Changelog

View File

@ -5,10 +5,6 @@
{
"url": "https://teddit.ggc-project.de"
},
{
"url": "https://teddit.kavin.rocks",
"onion": "http://teddit4w6cmzmj5kimhfcavs7yo5s7alszvsi2khqutqtlaanpcftfyd.onion"
},
{
"url": "https://teddit.zaggy.nl"
},
@ -70,5 +66,12 @@
{
"url": "https://teddit.bus-hit.me",
"notes": "Operated by https://bus-hit.me"
},
{
"url": "https://teddit.froth.zone"
},
{
"url": "https://trom.tf/",
"notes": "Part of the https://trom.tf/ project"
}
]