From: Angus Gratton <angus@espressif.com>
Date: Mon, 21 May 2018 00:42:24 +0000 (+0800)
Subject: Merge branch 'patch-2' into 'master'
X-Git-Tag: v3.1-beta1~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a6e367cd943621dcbbfdfce8f139e8b3ef1b0ea;p=esp-idf

Merge branch 'patch-2' into 'master'

Update idf-monitor.rst

See merge request idf/esp-idf!2149
---

7a6e367cd943621dcbbfdfce8f139e8b3ef1b0ea