]> cloud.milkyroute.net Git - dolphin.git/commit
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)
commit87ddbf770e1202e2b869e89f5ce609a0e856bdec
tree561c353b1a864292b2428f38d342997f32054abf
parentb706108206be1c9e777e1ace02aa99247fdfc3ca
parente93e6d4cc5231c5ee209f1ac9df70bbb253ce786
Merge branch 'Applications/16.08'

* Applications/16.08:
  Don't load twice kfileitemaction plugins with json metadata
  Fix logic for loading kfileitemaction plugins