Manuel J. Bernal 6c630f27d5 Resolved conflicts		2020-06-19 12:46:09 +02:00
..
opendistro-elasticsearch	Resolved conflicts	2020-06-19 12:46:09 +02:00
opendistro-kibana	Disable multitenancy until 3.13 fix	2020-06-12 13:20:23 +02:00