branch: elpa-admin commit a703bf2fc813a8086cf41f6a49f72ae53987a498 Merge: 1329950 3f66070 Author: rocky <[email protected]> Commit: rocky <[email protected]>
Merge branch 'master' of github.com:rocky/emacs-load-relative
Conflicts:
.gitignore
