sinthuja 2803ba29e7 Merge branch 'pr1049' into origin-master ... # Conflicts: # modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs		2017-06-23 17:10:14 +05:30
..
src	Merge branch 'pr1049' into origin-master	2017-06-23 17:10:14 +05:30
pom.xml	added default purge configuration	2017-05-29 05:45:55 +05:30