diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-12-29 13:29:41 +0200 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-12-29 13:29:41 +0200 |
| commit | 91a6006bde3611f57fc8fa21d148cfc487e6eb56 (patch) | |
| tree | 36e75ff5bd4ae3deed7a4bbbf00b95f4e74d451a /themes/luci-theme-rosy/htdocs/luci-static/rosy/js | |
| parent | 068755e6033560df11d853e5b2a104bfb95da8ea (diff) | |
| parent | 03849e55d2a02dc5a1de0dcd99c70047280f14d0 (diff) | |
treewide: fix weblate conflicts
Merge remore tracking branch 'weblate/master' and
fix conflicts.
Diffstat (limited to 'themes/luci-theme-rosy/htdocs/luci-static/rosy/js')
0 files changed, 0 insertions, 0 deletions