]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b706108 e93e6d4)
Merge branch 'Applications/16.08'
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 10 Sep 2016 20:01:09 +0000 (22:01 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 10 Sep 2016 20:01:09 +0000 (22:01 +0200)
* Applications/16.08:
  Don't load twice kfileitemaction plugins with json metadata
  Fix logic for loading kfileitemaction plugins


Trivial merge