diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2023-02-09 23:30:37 +0200 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2023-02-09 23:30:37 +0200 |
| commit | a53164c880e33150d83fef6c905f445f1e00fbd8 (patch) | |
| tree | 0fb958c831d548f2c6f4fcc7450ebca0a6f9fb13 /applications/luci-app-https-dns-proxy/luasrc | |
| parent | d6cd72fca0940e485758f298235a25efb2feeeca (diff) | |
| parent | 3297f2f40f6fb6abf35fbd78f4ccd4933bad4e80 (diff) | |
Merge remote-tracking branch 'weblate/master'
Fix conflict.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-https-dns-proxy/luasrc')
0 files changed, 0 insertions, 0 deletions