| commit | f04a346bed19b8fd299f926870a12498373684c1 | [log] [tgz] |
|---|---|---|
| author | Christian Aistleitner <christian@quelltextlich.at> | Mon May 25 16:48:33 2020 +0200 |
| committer | Christian Aistleitner <christian@quelltextlich.at> | Mon May 25 16:49:59 2020 +0200 |
| tree | 771fa5adf02f8e1b08dbf56ab196707868a5b7ee | |
| parent | 647b1f9e2f42e8ad4eec7a4d401ef515611bb107 [diff] | |
| parent | 21ab0b51fd02ecaf5319e81e3d55638786a3d6df [diff] |
Merge branch 'stable-3.0' This merge was done with 'ours' strategy to connect stable-3.0 and stable-3.1 while keeping the latest fixes on stable-3.1 and not merge any of the file deletions on stable-3.0. Change-Id: I1f62b33e7a4bf6ada266729515800e9353df0271