diff options
| author | rekado <rekado@elephly.net> | 2015-06-03 14:32:08 +0200 |
|---|---|---|
| committer | rekado <rekado@elephly.net> | 2015-06-03 14:32:08 +0200 |
| commit | 1f8a9357af1dc2e5904391a1d1724ade2acf6829 (patch) | |
| tree | eb3a9703d355d6d24131d9b230445320af9bab61 /eshell/alias | |
| parent | aa24de9938a2764d89888d0e8745bd4fb8d6d477 (diff) | |
| parent | 7b17ebecd63ce78b7de5ba169886fc3a8a35faa0 (diff) | |
Merge branch 'master' of elephly.net:/srv/repos/software/emacs
Conflicts:
lisp/init-magit.el
Diffstat (limited to 'eshell/alias')
0 files changed, 0 insertions, 0 deletions