4 Commits

Author	SHA1	Message	Date
enriquecd	a6b28cb40e	Fix MR - #1748	2018-02-13 15:59:30 +01:00
enriquecd	c0ee22dbd9	MR 12 clusters - #1748	2018-02-07 15:19:17 +01:00
enriquecd	65dccd3935	MR 12 changes for cnimation clock ticket - #1403	2018-02-06 10:52:49 +01:00
danielmaya	aea9d6ae36	resolved conflicts with containers and added mr12	2018-02-06 09:21:07 +01:00