| commit | bd7e843722d16e0f5d06e5044b6dd95b69f2f3de | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Thu Apr 27 15:19:10 2017 +0200 |
| committer | David Pursehouse <dpursehouse@collab.net> | Thu Apr 27 15:19:41 2017 +0200 |
| tree | 12804b222aaf2b60beb860f567b065c5b8bc9a70 | |
| parent | 3b2a6bdce64cc97a5440ec3f435e199a1de4d9c0 [diff] | |
| parent | 62a441929af092a0309bf661b2fd995cbbed5ee7 [diff] |
Merge branch 'stable-2.14' * stable-2.14: Revert "Adapt to recent changes in the plugin API" This merge reverts the revert done on stable-2.14, since that commit is actually needed on master. Thus this is in effect an empty merge. Change-Id: Ieed503f9ef15e1f4922a6667a8347ae13e4d9f2a