diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-11-24 00:11:48 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-11-24 00:11:48 +0100 |
| commit | 5e1253f4f7032e7bdbb106222f2bc2f0760bcb6d (patch) | |
| tree | b952e42636ca3e23dddd6dc6585e367faad739e4 /protocols/luci-proto-relay | |
| parent | 23b03caaa011c9b3481a62a7af0a087ac1521e78 (diff) | |
| parent | 758e13625af83039b48309f32625cc62a867cf56 (diff) | |
treewide: fix weblate merge conflicts
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'protocols/luci-proto-relay')
0 files changed, 0 insertions, 0 deletions