diff options
author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-05 12:22:37 +0200 |
---|---|---|
committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-05 12:22:37 +0200 |
commit | 1cd0a4439bb132d095c8919e0016865b7210e7c0 (patch) | |
tree | a9561bb9ba4c622f8740d6f529e030cf0453ef46 /applications/luci-app-polipo/po/mr | |
parent | d60a1a13b091c622bc2d4d63321d2e3ea0437796 (diff) | |
parent | c2684197cb45443fdfe042221b7edb23f9d91057 (diff) |
Merge remote-tracking branch 'weblate/master'
Fixed weblate conflicts. Again. Hopefully.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-polipo/po/mr')
0 files changed, 0 insertions, 0 deletions