diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-05-01 23:47:31 +0300 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-05-01 23:47:31 +0300 |
| commit | f9a2f889ffb690770b6c8af7cc1a556cb2a99904 (patch) | |
| tree | d1e40b44776a27410bccb1fa51cc8a89a621088d /.cproject | |
| parent | ae13dcfefc6d9c1b47de75f9d671e7afb33dd298 (diff) | |
| parent | 5d66e288491e6353f8a2b33c5d4c8aa3cd3c6f74 (diff) | |
Merge remote-tracking branch 'weblate/master'
Fix conflicts.
signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to '.cproject')
0 files changed, 0 insertions, 0 deletions