Merge branch 'master' into 'dev'

Browse Source

Previous attempts to merge failed due to bugs in merge tools. Performing merge from command line works as expected.

...

This commit is contained in:

Magne Sjaastad 2019-12-20 09:37:03 +01:00

parent 46c14af2fd 823e2abe7a

commit f22161bf6e

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