git.99rst.org / openwrt-luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23b03ca 758e136)
treewide: fix weblate merge conflicts
authorJo-Philipp Wich <redacted>
Sat, 23 Nov 2019 23:11:48 +0000 (00:11 +0100)
committerJo-Philipp Wich <redacted>
Sat, 23 Nov 2019 23:11:48 +0000 (00:11 +0100)
Signed-off-by: Jo-Philipp Wich <redacted>

Trivial merge
git clone https://git.99rst.org/PROJECT