Merge branch 'master' into fix_simple_mode_disabled_features

Browse source

# Conflicts:
#	resources/qml/SidebarSimple.qml

...

This commit is contained in:

fieldOfView 2017-09-04 16:36:27 +02:00

parent 6656cd0c36 20ffb0cd6d

commit adc1630a20

307 changed files with 13130 additions and 2517 deletions

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

1085

resources/qml/SidebarSimple.qml

View file

File diff suppressed because it is too large Load diff