1
0
mirror of https://github.com/tiyn/wiki.git synced 2025-10-09 17:38:14 +02:00

merge conflict

This commit is contained in:
TiynGER
2021-04-30 00:36:54 +02:00

@@ -1,7 +1,7 @@
# Alternatives to # Recommended
This article is a list of proprietary hard- and software and alternatives to This article is a list of proprietary hard- and software, its alternatives and other
them or privacy respecting clients/frontends. good free and/or open-source software.
## Social networks and platforms ## Social networks and platforms