git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6eba4bf 126d323)
Merge remote-tracking branch 'origin/spikes/koen' into kjvdh/features/testing
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 19 Dec 2017 12:15:50 +0000 (12:15 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 19 Dec 2017 12:15:50 +0000 (12:15 +0000)

Trivial merge