Merge branch 'develop' into features/r2_11_2/JAL-3829_3dbeacons
[jalview.git] / .gitattributes
2014-10-14 gmungocJAL-1551 CRLF handling
2014-10-10 gmungocJAL-1551 CRLF handling