| commit | e2c1f0a7cd4fa3bf7477eaebf89c7ac11aec4f78 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Tue Jun 18 23:08:03 2019 +0200 |
| committer | omar <omarcornut@gmail.com> | Tue Jun 18 23:12:50 2019 +0200 |
| tree | 75a1a1605070cd16274acc12dec157d0e8bd7480 | |
| parent | ca43436cd395e52191d557800503852bd343c2ea [diff] | |
| parent | dd41df3e98e85030bd478d0c68404667072ec5f1 [diff] |
Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt