Merge branch 'tap-nobridge' to master
authorAlain Takoudjou <talino@tiolive.com>
Thu, 19 Mar 2015 15:38:58 +0000 (16:38 +0100)
committerAlain Takoudjou <talino@tiolive.com>
Thu, 19 Mar 2015 15:38:58 +0000 (16:38 +0100)
commitef4551b897f4ba584a1b263f8288f945af83ea7c
tree9e4ee8a64b8df9005538792a1b6f3ed5554ba8a7
parent28753466b7ced5a15df7c70f5d187d4824a45d05
parenteb76d6cc989b7ae99e79e644203cad4e9f078805
Merge branch 'tap-nobridge' to master

Conflicts:
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/SoftwareProduct_getSortedSoftwareReleaseList.xml