Jo-Philipp Wich 5e1253f4f7 treewide: fix weblate merge conflicts ... Signed-off-by: Jo-Philipp Wich <jo@mein.io>		2019-11-24 00:11:48 +01:00
..
htdocs/luci-static/resources/view/nextdns	luci-app-nextdns: port to client side	2019-11-19 17:42:53 +08:00
luasrc/controller	luci-app-nextdns: port to client side	2019-11-19 17:42:53 +08:00
po	treewide: fix weblate merge conflicts	2019-11-24 00:11:48 +01:00
root	luci-app-nextdns: port to client side	2019-11-19 17:42:53 +08:00
Makefile	luci-app-nextdns: add luci integration for nextdns package	2019-11-12 18:19:27 -08:00