Merge remote-tracking branch 'origin/master' into develop

Browse source

Conflicts:
    Tests/Functional/Hooks/DataHandler/IgnoresUnkownOperationTest.php

...

This commit is contained in:

Daniel Siepmann 2018-03-15 15:16:59 +01:00

parent 0461cf3b21 ebf722a03e

commit 17d9ae5341

Signed by: Daniel Siepmann

GPG key ID: 33D6629915560EF4

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 is not available