tree f3da039211b9e79cb08eed7b4069d5855249233e
parent cc03ee89d361ff92af739ffb83056dfc89e00726
parent 7952e761810dab5f5150ac1144c189889618df1c
author Fabio Ponciroli <ponch78@gmail.com> 1790057944 +0200
committer Fabio Ponciroli <ponch78@gmail.com> 1790057944 +0200

Merge branch 'stable-3.12' into stable-3.13

* stable-3.12:
  Skip plugins with malformed JSON metadata

Change-Id: I6467122a3ccf9ded61e65c1ae90b94a0b2eecfcb