]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'cherry-pick-292c2abd' into 'release/v2.1'
authorIvan Grokhotkov <ivan@espressif.com>
Sun, 23 Jul 2017 06:35:33 +0000 (14:35 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Sun, 23 Jul 2017 06:35:33 +0000 (14:35 +0800)
Merge branch 'bugfix/init_nvs_in_bluetooth' into 'master'

See merge request !1031


Trivial merge