projects
/
feed
/
packages.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7be003f
1f5ed5d
)
Merge pull request #1946 from dibdot/master
author
Ted Hess
<thess@kitschensync.net>
Wed, 11 Nov 2015 22:00:32 +0000
(17:00 -0500)
committer
Ted Hess
<thess@kitschensync.net>
Wed, 11 Nov 2015 22:00:32 +0000
(17:00 -0500)
adblock: uci support, dynamic uhttpd instance support plus various fixes
Trivial merge