diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2020-05-08 10:10:02 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2020-05-08 10:10:02 +0300 |
| commit | b02354b209e7f5c597fad28008f9784a7885e14f (patch) | |
| tree | edc084c3c1b44760c8f35840f78e65ac483374f3 /docs | |
| parent | 23cdf871c1f6b1bb49311d295370314f2669fc14 (diff) | |
| parent | 69f23eca9409e65435dbb01e76f8d68d092b490e (diff) | |
Merge branch '4.6'
Conflicts:
plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions