Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
[jalview.git] / .gitattributes
2014-10-14 gmungocJAL-1551 CRLF handling
2014-10-10 gmungocJAL-1551 CRLF handling