diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-01 12:39:48 +0200 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-01 12:39:48 +0200 |
| commit | 7c46a0703ce2ba79d08509fc64eb48c811fa88f6 (patch) | |
| tree | fd5c701a556b12485e877cd5f67b80b1ef2c94fb /modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json | |
| parent | 13f9718be05d159fb351d9ea4965490ffb61a69a (diff) | |
| parent | 5ff23089a271f04a158fd39ed2ebf637060355ad (diff) | |
Merge remote-tracking branch 'weblate/master'
Fixed the weblate conflicts. Hopefully...
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json')
0 files changed, 0 insertions, 0 deletions