Hannu Nyman 1cd0a4439b Merge remote-tracking branch 'weblate/master' ... Fixed weblate conflicts. Again. Hopefully. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>		2020-01-05 12:22:37 +02:00
..
luasrc	ocserv: fix the public key ID calculation	2019-12-14 09:55:48 +01:00
po	Merge remote-tracking branch 'weblate/master'	2020-01-05 12:22:37 +02:00
Makefile	treewide: move templates and libraries not used by the core to luci-compat	2019-11-03 17:56:58 +01:00