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.

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

M20-51: New Opt-in for Ghostery #444

Merged
Prev

Merge branch 'develop' into M20-51_anewest_rewards_optin

  • Loading branch information
christophertino committed Sep 6, 2019
commit 5acd76db206e2cde8630c196664efdfe1300321a
@@ -98,32 +98,30 @@ class RewardsApp {

this.mainView = props => (
<Router history={history}>
<root.div>
<link
rel="stylesheet"
type="text/css"
href={chrome.extension.getURL('dist/css/rewards_styles.css')}
/>
<Route
exact
path="/"
render={
() => <OfferCard reward={props.reward} conf={props.conf} port={this.port} actions={props.actions} />
}
/>
<Route
path="/hotdog"
render={
() => <HotDog reward={props.reward} port={this.port} actions={props.actions} />
}
/>
<Route
path="/offercard"
render={
() => <OfferCard reward={props.reward} conf={props.conf} port={this.port} actions={props.actions} />
}
/>
</root.div>
<link
rel="stylesheet"
type="text/css"
href={chrome.extension.getURL('dist/css/rewards_styles.css')}
/>
<Route
exact
path="/"
render={
() => <OfferCard reward={props.reward} conf={props.conf} port={this.port} actions={props.actions} />
}
/>
<Route
path="/hotdog"
render={
() => <HotDog reward={props.reward} port={this.port} actions={props.actions} />
}
/>
<Route
path="/offercard"
render={
() => <OfferCard reward={props.reward} conf={props.conf} port={this.port} actions={props.actions} />
}
/>
</Router>
);
this.initListener();
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.