Merge branch 'master' into master

Gleek · Dec 30, 2020 · e8eb238 · e8eb238
2 parents 0f54799 + aaf33fc
commit e8eb238
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/README.org b/README.org
@@ -38,3 +38,12 @@ By default, the resulting =*jq-json*= buffer will have the major mode
 =js-mode=, but that can be customized with the
 =counsel-jq-json-buffer-mode= variable if you prefer =json-mode=,
 =rsjx-mode= or any other mode.
+
+** EmacsConf 2020 talk on =counsel-jq=
+
+On [2020-11-29 Sun], [[https://github.com/munen/][Zen Monk Alain M. Lafon (@munen)]] gave a talk at
+EmacsConf 2020 introducing =counsel-jq=. There's a video recording
+with explanations and demos behind this complementary blog post:
+https://200ok.ch/posts/2020-11-30_emacsconf_traverse_complex_json_structures_with_live_feedback_with_counseljq.html
+
+#+html: <p align="center"><a href="https://200ok.ch/posts/2020-11-30_emacsconf_traverse_complex_json_structures_with_live_feedback_with_counseljq.html"><img src="https://github.com/200ok-ch/counsel-jq/raw/master/images/emacsconf-2020-video-preview.png"/></a></p>
diff --git a/images/emacsconf-2020-video-preview.png b/images/emacsconf-2020-video-preview.png