commit | 66e718e753a527289ce86cd206fcffd23fc28d81 | [log] [tgz] |
---|---|---|
author | Albert Astals Cid <aacid@kde.org> | Mon Jul 31 16:39:53 2017 +0200 |
committer | Albert Astals Cid <aacid@kde.org> | Mon Jul 31 16:39:53 2017 +0200 |
tree | dc0c32b66c42fabc3553709e72d2b4ee9a8c1dcd | |
parent | 9cecd78ff12a145fd7a61d226d54fd8f9ce19638 [diff] | |
parent | 213ae24b4df97f557e771060e37197d0e57f6f7f [diff] |
Merge remote-tracking branch 'origin/master' into better_object