Skip to content
This repository has been archived by the owner on Jun 6, 2019. It is now read-only.

properly merge ads and trackers blocked list #79

Merged
merged 1 commit into from
Oct 30, 2018
Merged

properly merge ads and trackers blocked list #79

merged 1 commit into from
Oct 30, 2018

Conversation

cezaraugusto
Copy link
Contributor

follow-up of #78

STR:

  1. go to https://twitter.com/brianbondy
  2. check there are 5 ads/trackers blocked
  3. click the arrow down to go to resources blocked list
  4. there should be 5 resources

@cezaraugusto cezaraugusto self-assigned this Oct 30, 2018
@cezaraugusto cezaraugusto requested review from bbondy and yrliou October 30, 2018 21:20
yrliou
yrliou approved these changes Oct 30, 2018
View reviewed changes
Copy link
Member

@yrliou yrliou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, test plan passed on mac

@cezaraugusto cezaraugusto merged commit 6ba9928 into master Oct 30, 2018
@cezaraugusto cezaraugusto deleted the shields_total_blocked branch October 30, 2018 23:06
@cezaraugusto cezaraugusto mentioned this pull request Oct 31, 2018
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@yrliou yrliou yrliou approved these changes

@bbondy bbondy Awaiting requested review from bbondy

Assignees

@cezaraugusto cezaraugusto

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cezaraugusto @yrliou