diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-06 11:39:01 +0200 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-06 11:39:01 +0200 |
| commit | 55dcc8ab5c60334becd783e1c01f8de8ae3a9977 (patch) | |
| tree | b9c0bf72cf0f35fdfc36c5e349177eae9aca4a4f /applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua | |
| parent | 1cd0a4439bb132d095c8919e0016865b7210e7c0 (diff) | |
| parent | 488eccf319b515668333dedf912e80afda96f4f9 (diff) | |
Merge remote-tracking branch 'weblate/master' into wlfix
Fixed one conflict.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua')
0 files changed, 0 insertions, 0 deletions