From: Eric Wong <e@80x24.org>
Date: Thu, 17 Oct 2019 08:19:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/inboxdir'
X-Git-Tag: v1.2.0~32
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;ds=sidebyside;h=fece7fca6aeac74410a813cffcb0da338017d0ed;p=public-inbox.git

Merge remote-tracking branch 'origin/inboxdir'

* origin/inboxdir:
  config: remove redundant inboxdir check
  config: support "inboxdir" in addition to "mainrepo"
  examples/grok-pull.post_update_hook: use "inbox_dir"
---

fece7fca6aeac74410a813cffcb0da338017d0ed