Merge branch 'dev' of github.com:GravitLauncher/Launcher into dev

This commit is contained in:
Gravit 2019-06-10 11:24:42 +07:00
commit a56bd18e95
No known key found for this signature in database
GPG key ID: 061981E1E85D3216

View file

@ -21,7 +21,7 @@ public class StandartClientWebSocketService extends ClientWebSocketService {
public WaitEventHandler waitEventHandler = new WaitEventHandler(); public WaitEventHandler waitEventHandler = new WaitEventHandler();
public StandartClientWebSocketService(GsonBuilder gsonBuilder, String address, int i) throws SSLException { public StandartClientWebSocketService(GsonBuilder gsonBuilder, String address, int i) throws SSLException {
super(null, address, i); super(gsonBuilder, address, i);
} }
public class RequestFuture implements Future<ResultInterface> { public class RequestFuture implements Future<ResultInterface> {