diff options
author | Urbain Vaes <urbain@vaes.uk> | 2015-07-15 19:35:01 +0100 |
---|---|---|
committer | Urbain Vaes <urbain@vaes.uk> | 2015-07-15 19:35:01 +0100 |
commit | f1a6befc16d8001e86c94e133a37f0ce53eef730 (patch) | |
tree | 6e8404a35ba3e79c06dc42f34e4a04582dc5abe1 /.gitconfig | |
parent | d1bde67fb2d50e882ef98fd359b29b820133982e (diff) | |
parent | a6828d1d44c752e813b7c6395329430d9f0eee99 (diff) |
Merge branch 'master' of github.com:uvaes/dotfiles
Conflicts:
repos.zsh
zshrc
Diffstat (limited to '.gitconfig')
0 files changed, 0 insertions, 0 deletions