Merge branch 'Jalview-BH/JAL-3026' of
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 21 Aug 2018 18:30:37 +0000 (13:30 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 21 Aug 2018 18:30:37 +0000 (13:30 -0500)
commita5af7a36aa6a66935d94ae84c3259db4593de592
tree8cc9bb3270ede8014bec369533e09578f689cad3
parent3a388a03f5dd2cae5b74e86a23cc528cf5f648c9
parent1114d77a17494eebd345fe0e908065ec10398f11
Merge branch 'Jalview-BH/JAL-3026' of
https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

Conflicts:
swingjs/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.2/SwingJS-site.zip
swingjs/ver/3.2.2/timestamp
swingjs/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.2/SwingJS-site.zip
swingjs/ver/3.2.2/timestamp