Merge branch 'bug/JAL-3633_read_proxy_settings_from_jalview_properties_in_getdown...
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 27 Jan 2022 14:21:39 +0000 (14:21 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 27 Jan 2022 14:21:39 +0000 (14:21 +0000)
commitb26fefd329b60deb2025aa28cdbaae30bfb58382
tree3592d2e572f40539ec924a8740dc93bc4900c30e
parentf2bb3db094696bb382ecb8d08913c1b5dc293b53
parent338c105e7b8d9490dc2abf825255c4aa30d52fcd
Merge branch 'bug/JAL-3633_read_proxy_settings_from_jalview_properties_in_getdown' into develop

 Conflicts:
src/jalview/bin/MemorySetting.java
build.gradle
gradle.properties
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Launcher.java
src/jalview/bin/MemorySetting.java
src/jalview/gui/Preferences.java
src/jalview/jbgui/GPreferences.java
src/jalview/util/StringUtils.java