Merge branch 'Jagadees-zyxware-master'
authorManoj K <manoj.k@zyxware.com>
Wed, 29 Oct 2014 03:55:57 +0000 (09:25 +0530)
committerManoj K <manoj.k@zyxware.com>
Wed, 29 Oct 2014 03:55:57 +0000 (09:25 +0530)
commit04ccc012062953fefed73df42fe7984347241bb1
tree4ff8b1eb2c27426d9e5e753ce3dc148f6d940fc9
parentc3f3cbbb3c5e94cf5b1e95d6105ce847ddfb8067
parent53aa9e75584c38b008fadbeb9ba8b7e7516e1bb4
Merge branch 'Jagadees-zyxware-master'
templates/CRM/Wci/Page/ProgressBarList.tpl
templates/CRM/Wci/Page/WidgetList.tpl