commit | 9cecd78ff12a145fd7a61d226d54fd8f9ce19638 | [log] [tgz] |
---|---|---|
author | Albert Astals Cid <aacid@kde.org> | Sat Jun 17 18:35:14 2017 +0200 |
committer | Albert Astals Cid <aacid@kde.org> | Sat Jun 17 18:35:14 2017 +0200 |
tree | b7d86075bc8a78b6e1818118101fa41a9fd3b8b4 | |
parent | b5ca57dbfecd9e680b3bd4b293b0eac400d24cfb [diff] | |
parent | 23a2f6a2492a0957489eac31b6700b4d68180bdb [diff] |
Merge remote-tracking branch 'origin/master' into better_object