Merge branch 'Jupiter-10.6.0-bpm-admin' of https://github.com/kaltura… · rotemhaber2/server@bbc859c · GitHub

Commit

Merge branch 'Jupiter-10.6.0-bpm-admin' of https://github.com/kaltura…

Browse files

…/server into Jupiter-10.6.0-bpm-admin

Conflicts:
	plugins/event_notification/providers/bpm/providers/activiti/ActivitiBusinessProcessNotificationPlugin.php

Loading branch information

tan-tan-kanarek authored and tan-tan-kanarek committed Mar 8, 2015

2 parents f9cc80a + 50ab97c commit bbc859c