Clone
Jim Procter <j.procter@dundee.ac.uk>
committed
10 months ago
Merge branch 'bug/JAL-3633_read_proxy_settings_from_jalview_properties_in_getdown' into develop
Conflicts:
src/jalview/bin/MemorySetting.j… Show more
Merge branch 'bug/JAL-3633_read_proxy_settings_from_jalview_properties_in_getdown' into develop

Conflicts:

        src/jalview/bin/MemorySetting.java

Show less

master + 53 more