[MERGE] Forward-port saas-11 up to 21f93b8035

Browse Source

Empty forward-port because commit 21f93b8035
is only a backport that does not need to be forward-ported again.

The point of this fwd-port was to resolve the conflicts immediately.

...

This commit is contained in:

Olivier Dony

2017-06-13 13:19:09 +02:00

parent 577eb10c0b 21f93b8035

commit 70d522eb31

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

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

Diff Content Not Available