Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 7 Nov 2016 15:58:24 +0000 (15:58 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 7 Nov 2016 15:58:24 +0000 (15:58 +0000)
commit8c04eddb0471d585f31292accfef12acf021b825
treee170988110926ea8b2c7ee66ad2c1a713dc90b82
parente8276f5598621d3f7e19c6bdbc49276706322c43
parent18b3340e9675469c59efd0e562a6620057a20f90
Merge branch 'develop' into features/JAL-2295setChimeraAttributes
resources/lang/Messages.properties