Igor Kulikov 04722e5e8f Fix conflicts

2019-06-26 18:54:41 +03:00

..

src

Fix conflicts

2019-06-26 18:54:41 +03:00

.gitignore

Add Chinese Translation for Version 1.2.3 (#131)

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

build.gradle

Improve debian packaging scripts.

2019-06-20 13:31:38 +03:00

pom.xml

Websockets reverted

2019-02-22 15:15:27 +02:00