Merge branch 'develop' into bug/JAL-2934proportionalScrolling
[jalview.git] / utils / conda /
drwxr-xr-x   ..
-rwxr-xr-x 5757 jalview.sh