luci/applications/luci-app-adblock
Hannu Nyman 55dcc8ab5c Merge remote-tracking branch 'weblate/master' into wlfix
Fixed one conflict.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-01-06 11:39:01 +02:00
..
luasrc luci-app-adblock: fix spelling: UDP, TCP, e-mail, DNS, cache 2019-12-25 18:20:14 +01:00
po Merge remote-tracking branch 'weblate/master' into wlfix 2020-01-06 11:39:01 +02:00
root/etc/uci-defaults treewide: remove useless ucitrack definitions 2019-12-25 18:02:54 +01:00
Makefile treewide: move templates and libraries not used by the core to luci-compat 2019-11-03 17:56:58 +01:00