]> git.eshelyaron.com Git - emacs.git/commit
Merge remote-tracking branch 'origin/master' into defer-install
authorRadon Rosborough <radon.neon@gmail.com>
Sun, 19 Mar 2017 03:43:40 +0000 (20:43 -0700)
committerRadon Rosborough <radon.neon@gmail.com>
Sun, 19 Mar 2017 03:43:40 +0000 (20:43 -0700)
commit249de4b44defa24da051a990bb5ac012f4050734
tree87ac7202ca16b5547e24e8f4395d5ea23c7f6966
parentb2e674de0a30c5961e7e31a8658b3eba9a229ba1
parent45442561d3ec095b7fa244d3b2c80b9847baee99
Merge remote-tracking branch 'origin/master' into defer-install

Resolve merge conflicts.
lisp/use-package/use-package.el