merge conflict

3 years ago · 313bd07eaf
parent 29a7e561ab 165b6f3532
commit 313bd07eaf
1 changed files with 3 additions and 3 deletions
--- a/wiki/recommended.md
+++ b/wiki/recommended.md
@ -1,7 +1,7 @@
-# Alternatives to
+# Recommended

-This article is a list of proprietary hard- and software and alternatives to
-them or privacy respecting clients/frontends.
+This article is a list of proprietary hard- and software, its alternatives and other
+good free and/or open-source software.

 ## Social networks and platforms