Merge remote-tracking branch 'origin/profile_inheritance' into profile_changes_reset

Browse source

...

This commit is contained in:

YuSanka 2018-03-14 16:34:51 +01:00

parent 639f2bc2f3 e680658cf5

commit a41e55a773

25 changed files with 688 additions and 10209 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

BIN

resources/icons/lock.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 749 B

BIN

resources/icons/lock_open.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 727 B