@krishnaglodha this PR is the rebase of your add_protocol branch into develop with conflicts managed by me. It might be now reviewed and then merged with develop but I want to check with you that the conflicts have been managed in the right way and so I didn't miss anything.
Please let me know and in case you can checkout the branch hotfix/handle-conflicts-add-protocol and directly push any fix to that
@krishnaglodha this PR is the rebase of your
add_protocol
branch intodevelop
with conflicts managed by me. It might be now reviewed and then merged withdevelop
but I want to check with you that the conflicts have been managed in the right way and so I didn't miss anything.Please let me know and in case you can checkout the branch
hotfix/handle-conflicts-add-protocol
and directly push any fix to that