Hannu Nyman 7c46a0703c Merge remote-tracking branch 'weblate/master' ... Fixed the weblate conflicts. Hopefully... Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>		2020-01-01 12:39:48 +02: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	Translated using Weblate (French)	2019-12-26 19:24:05 +01:00
root	treewide: remove useless ucitrack definitions	2019-12-25 18:02:54 +01:00
Makefile	luci-app-nextdns: add luci integration for nextdns package	2019-11-12 18:19:27 -08:00