From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sat, 10 Sep 2016 20:01:09 +0000 (+0200)
Subject: Merge branch 'Applications/16.08'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/87ddbf770e1202e2b869e89f5ce609a0e856bdec?hp=-c

Merge branch 'Applications/16.08'

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

87ddbf770e1202e2b869e89f5ce609a0e856bdec