diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-12-12 17:28:56 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-12-12 17:28:56 -0500 |
| commit | 0080e90291a4792ea5efcf00986c68a9bc27c25c (patch) | |
| tree | 91d2ea1a0546aecc3d56b72b1e4d39808effe173 /.local | |
| parent | 6561052195e6cd7e32b50ac0a588cac021b922ff (diff) | |
| parent | 21bb3f7fb1111d8b1043ff4c3a1d821042a8e4c6 (diff) | |
Merge branch 'master' into gluglugt60-par/master
# Conflicts:
# .config/emacs/custom.el
# .config/emacs/init.el
Diffstat (limited to '.local')
0 files changed, 0 insertions, 0 deletions