Igor Kulikov d982c09f68 Fix conflicts

2022-06-17 13:04:32 +03:00

..

src

Fix conflicts

2022-06-17 13:04:32 +03:00

.gitignore

Add Chinese Translation for Version 1.2.3 (#131)

2017-05-07 22:38:50 +03:00

pom.xml

Merge branch 'develop/3.4' into feature/2fa

2022-05-26 17:44:38 +03:00