Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609...
authorBen Soares <b.soares@dundee.ac.uk>
Tue, 8 Dec 2020 20:42:31 +0000 (20:42 +0000)
committerBen Soares <b.soares@dundee.ac.uk>
Tue, 8 Dec 2020 20:42:31 +0000 (20:42 +0000)
commit132fa48b35a4821ca0d8e241ba27989e573e61e5
treebe13a40928c8bbd4585bf6e1949c0eb72099f97f
parente305cfe169bc0ba6ee04f78b7720ca985392f114
parent89729f14cea967fc6992d8b1b3de2f3fa9bc6b3c
Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609+JAL-3541+Release_2_11_1_Branch' into merge/JAL-3594_and_new_develop_issues
build.gradle
src/jalview/bin/Jalview.java
src/jalview/bin/Launcher.java
src/jalview/gui/Desktop.java