Commit 81acc9a5 authored by Scupake's avatar Scupake
Browse files

Trying to fix the merge request conflict

parents 47a8741f f9e668e6
......@@ -251,6 +251,8 @@ Google Analytics, Google Tag Manager are high priority. When submitting these, h
18. [ ] [Exorcism](https://exorcism.io) uses Google **Analytics**
19. [ ] [covid19japan.com](https://github.com/reustle/covid19japan) uses Google **Analytics**, *Fonts*
- See https://github.com/reustle/covid19japan/issues/438
31. [ ] [DokuWiki's website](https://www.dokuwiki.org/dokuwiki) uses Google **Tag Manager**
32. [ ] [Reactive Resume](https://rx-resume.web.app/) uses Google **Tag Manager** and Google *CDNs*
### Operating Systems (OS)
......@@ -276,7 +278,6 @@ Google Analytics, Google Tag Manager are high priority. When submitting these, h
20. [ ] [GhostBSD](https://ghostbsd.org) uses Google *Fonts*, **Syndication**
21. [ ] [MidnightBSD](https://midnightbsd.org/) uses **Tag Manager**, **Syndication**, *Fonts*
22. [ ] [Liri](https://liri.io/) uses Google **Analytics**, *Fonts*
23. [ ] [DokuWiki's website](https://www.dokuwiki.org/dokuwiki) uses Google **Tag Manager**
24. [ ] [OpenMandriva's website](https://www.openmandriva.org) uses Google *CDNs*
25. [ ] [LineageOS](lineageos.org) uses Google **Analytics**; Google *CDNs*
- See https://github.com/LineageOS/www/pull/18
......@@ -334,6 +335,7 @@ Google Analytics, Google Tag Manager are high priority. When submitting these, h
32. [ ] [JDownloader](https://jdownloader.org/) uses **Search**, *Syndication*
33. [ ] [Hyperboria](https://hyperboria.net/) uses *Fonts*
34. [ ] [Zoneminder](https://zoneminder.com/) uses **Analytics**
35. [ ] [OpenOffice](https://openoffice.apache.org) uses **Analytics**
### Personal sites (Jekyll themes)
......@@ -389,4 +391,3 @@ Google Analytics, Google Tag Manager are high priority. When submitting these, h
## External links
1. [Comment by maskman1999](https://old.reddit.com/r/privacy/comments/gwsv5j/help_us_degoogle_foss_free_and_open_source/fsz3hpd/?context=3)
2. [Hyperbola](https://git.hyperbola.info:50100/software/blacklist.git/tree/blacklist.txt): containing a list of blocked packages; [original post](https://dev.lemmy.ml/post/34155/comment/6058). **DISCLAIMER: most are irrelevant and contain nonsensical reasoning. This is only kept due to relevancy of the project.**
# `DeGoogle-FOSS`, by [ReverseEagle](https://reverseeagle.org)
<div align="center">
<h1>
<code>DeGoogle-FOSS</code>
<span>by <a href="https://reverseeagle.org">ReverseEagle</a></span>
</h1>
<em>Taking the G out of FOSS.</em>
</div>
<br /> <!-- some spacing will do nicely. -->
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)
[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech)
......@@ -6,9 +14,6 @@
[![Matrix](https://img.shields.io/matrix/reverseeagle:privacytools.io?server_fqdn=matrix.org)](https://matrix.to/#/!TDiDZaaFzkUSHRWcxQ:chat.endl.site?via=fairydust.space&via=matrix.org&via=privacytools.io)
[![License: CC-BY-SA-4.0](https://img.shields.io/badge/License-CC--BY--SA--4-blue)](./LICENSE)
*Taking the G out of FOSS.*
This is a repository for the DeGoogle-FOSS project by the ReverseEagle team.
You will find information about what FOSS projects use proprietary Google components; what Google projects are FOSS; which are proprietary; issues and merge requests we have submitted to FOSS developers (see below).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment