Merge branch 'agent-master' into dev

Browse Source

agent-master went out of sync, probably some rebase/forcepush happened
on dev. Used `git merge -s ours agent-master` here to put all the
commits of agent-master on dev and ignoring anything from agent-master.

So now we can merge from dev to agent-master with fast forward and no
conflicts

...

This commit is contained in:

Luca Marturana 2017-01-17 10:55:07 +01:00

parent 43d53bb09e 1d0c9b1714

commit 4139370df5

No known key found for this signature in database

GPG Key ID: DCE5D8CEF3514555

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available