Skip to content

/ ghostery-extension

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.

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

Inter-extension communication with Cliqz #101

Merged
merged 6 commits into from Jul 19, 2018
+134 −1
Merged

Inter-extension communication with Cliqz #101

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
041c3a7
Implement import of antitracking and adblocker settings from cliqz.
sammacbeth Jun 12, 2018
d055828
Fix usage of conf
sammacbeth Jun 28, 2018
81dd92d
Update yarn.lock
sammacbeth Jun 28, 2018
7debd76
Merge branch 'develop' into import-cliqz-settings
christophertino Jul 9, 2018
28ba77c
Merge branch 'develop' into import-cliqz-settings
christophertino Jul 19, 2018
c9cb3c7
Merge branch 'develop' into import-cliqz-settings
christophertino Jul 19, 2018
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…
Merge branch 'develop' into import-cliqz-settings
  • Loading branch information
@christophertino
christophertino committed Jul 19, 2018
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
commit 28ba77cb0af57a097dd22e40a7d74b13a80be109

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.

ProTip! Use n and p to navigate between commits in a pull request.