Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes "Surveillance capitalism" term Will fix #25 #80

Merged
merged 2 commits into from
Apr 15, 2020
Merged

Removes "Surveillance capitalism" term Will fix #25 #80

merged 2 commits into from
Apr 15, 2020

Commits on Apr 15, 2020

  1. Removes "Surveillance capitalism" term Will fix #25 

    I very much agree with the comments made in Issue #25. This PR removes that term and uses the text proposed by @bumblefudge, as amended by @CarlosMassiah
    @philarcher
    philarcher committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    17fcecb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into philarcher-patch-16

    @jandrieu
    jandrieu committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    5d37527 View commit details
    Browse the repository at this point in the history