Merge branch 'feature/JAL-3686_slivka_client_js_update' into alpha/merge_212_JalviewJ... alpha/merge_212_JalviewJS_2112
authorMateusz Warowny <mmzwarowny@dundee.ac.uk>
Thu, 9 Jul 2020 14:43:01 +0000 (15:43 +0100)
committerMateusz Warowny <mmzwarowny@dundee.ac.uk>
Thu, 9 Jul 2020 14:43:01 +0000 (15:43 +0100)
commite3c3367f89785a5cff5fb3bd419c92ccb4ac13ea
treea127c252bdc6d7747a3e46f81241a1f98d25b04e
parentc794c5033adeee182b03a5ea92c0a7495a29661f
parent71c5a29a58e5505aaf7d63a8c9f1bea3ae93d629
Merge branch 'feature/JAL-3686_slivka_client_js_update' into alpha/merge_212_JalviewJS_2112

Conflicts:
src/jalview/gui/Desktop.java
src/jalview/gui/Preferences.java
src/jalview/jbgui/GPreferences.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/gui/Preferences.java
src/jalview/jbgui/GPreferences.java
src/jalview/ws/jws2/Jws2Discoverer.java