Merge branch 'develop' into bug/JAL-2399textColour bug/JAL-2399textColour
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 30 Mar 2017 11:20:53 +0000 (12:20 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 30 Mar 2017 11:20:53 +0000 (12:20 +0100)
commit9eabd6dffd6d19b2826b887a5def80351b9bceed
tree910dc3b6e47959baeb86cb254fa3db785bb845fb
parent9debcac658224e1a84ddff4c4fd9f696e812913f
parente6ece19f50638d865cfd599b9c82de14b56c93c2
Merge branch 'develop' into bug/JAL-2399textColour
resources/lang/Messages.properties
resources/lang/Messages_es.properties