summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-ttyd
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2020-01-23 21:23:11 +0200
committerHannu Nyman <hannu.nyman@iki.fi>2020-01-23 21:23:11 +0200
commit69dfaf222dd4895f58f37757baa29717a6745cd2 (patch)
tree0c29e2c8d2cbc210ccfb347d750e885f31db244a /applications/luci-app-ttyd
parentfdca2bfbe09a6df92178cce156d5132a56c29a42 (diff)
parent9a7ea73ea0d55a6568bf05f62010f7cdcc65d2c9 (diff)
Merge remote-tracking branch 'weblate/master'
Fix conflict at applications/luci-app-ddns/po/zh-tw/ddns.po Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-ttyd')
0 files changed, 0 insertions, 0 deletions