mirror of
https://github.com/tiyn/wiki.git
synced 2025-04-04 07:47:45 +02:00
merge conflict
This commit is contained in:
commit
313bd07eaf
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user