Merge branch 'features/JAL-2295setChimeraAttributes' into spikes/mungo
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 16:08:58 +0000 (16:08 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 16:08:58 +0000 (16:08 +0000)
commit8677e6e34e291edc58c1da2fc9c958473754143f
treead30e48c24516fcddaeeaf6038a212b7d2276701
parentfd9e6f7e0424bb69e46443d7d96237d99e792c03
parent9d943c5feee75910c47704215a4363f25fecb859
Merge branch 'features/JAL-2295setChimeraAttributes' into spikes/mungo