Merge branch 'master' into dev-2.0-rebase

Browse Source

...

This commit is contained in:

Fabian Reinartz 2017-01-30 17:30:28 +01:00

parent 035976b275 5e985f24de

commit 1d3cdd0d67

35 changed files with 923 additions and 158 deletions

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