branch: elpa-admin commit 73a80fcf739b3207e0a2ba422e74d38c8cc5fb15 Merge: 5b91341 da7456c Author: João Távora <joaotav...@gmail.com> Commit: João Távora <joaotav...@gmail.com>
Update packages/yasnippet by subtree-merging from its github-based upstream
packages/yasnippet/snippets is left untouched in GNU ELPA. The
upstream version uses a submodule pointing to a snippets repo which
lives at https://github.com/AndreaCrotti/yasnippet-snippets.git
Conflicts: packages/yasnippet/snippets
