branch: elpa-admin commit 8efb6263fd13dcaff6b749e57867fd68f478acd4 Merge: 8730258 1daf0bb Author: rocky <ro...@gnu.org> Commit: rocky <ro...@gnu.org>
Merge commit '4d1dcdf7631c23b1259ad4f72bf9686cf95fb46c' Conflicts: packages/loc-changes/loc-changes.el