Merge branch 'develop-ascraeus' into develop

Browse Source

* develop-ascraeus:
  [ticket/10985] Add fix to properly inherit style during update process

...

This commit is contained in:

Nils Adermann

2015-01-19 22:29:50 +01:00

parent 54e3b14583 e4a041fedb

commit c19fb8e2c9

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