merge conflict

master
TiynGER 4 years ago
commit 313bd07eaf

@ -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

Loading…
Cancel
Save