Skip to content
This repository was archived by the owner on Sep 9, 2022. It is now read-only.

Fixing #1149#1195

Merged
chrisaljoudi merged 8 commits intouBlock-LLC:masterfrom
AlexVallat:Fixing_#1149
Apr 7, 2015
Merged

Fixing #1149#1195
chrisaljoudi merged 8 commits intouBlock-LLC:masterfrom
AlexVallat:Fixing_#1149

Conversation

@AlexVallat
Copy link
Contributor

This is a fix for #1149, but because it's branched off my master it appears to also contain the changes from #1150 in it. I did try to rebase it to make it clean, but I'm clearly not good enough at git.

So, please either approve or reject #1150 first, then this one ought to just work. I hope.

chrisaljoudi added a commit that referenced this pull request Apr 7, 2015
@chrisaljoudi chrisaljoudi merged commit 6c877ee into uBlock-LLC:master Apr 7, 2015
@AlexVallat AlexVallat deleted the Fixing_#1149 branch April 7, 2015 07:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants