Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: slackr: improve interactivity slackr: hide calendar when posting more theme stuff * master:
This commit is contained in:
parent
f0ddcb979b
commit
3c15336984