commit | dbe7a5da3dce56210bd4ca2deaf8f5ad4a9d0529 | [log] [tgz] |
---|---|---|
author | Albert Astals Cid <aacid@kde.org> | Tue Aug 01 00:12:13 2017 +0200 |
committer | Albert Astals Cid <aacid@kde.org> | Tue Aug 01 00:12:13 2017 +0200 |
tree | 4c50bb4d30956bbef5d595d5287c54e632c26191 | |
parent | 687474e17db59482dc4538740701bdb32bc9d6bd [diff] | |
parent | c167f35b8c3fd7e94fa97385949b2c133d918ed4 [diff] |
Merge remote-tracking branch 'origin/master' into better_object