]> git.friedersdorff.com Git - max/dotfiles.git/commitdiff
projects / max / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f797c01 0404957)
Merge branch 'master' of github.com:maxf130/dotfiles
authorMaximilian Friedersdorff <maxf130@gmail.com>
Fri, 6 May 2016 11:45:24 +0000 (12:45 +0100)
committerMaximilian Friedersdorff <maxf130@gmail.com>
Fri, 6 May 2016 11:45:24 +0000 (12:45 +0100)
Conflicts:
mutt/.mutt/muttrc

1  2 
mutt/.mutt/muttrc patch | diff1 | diff2 | blob | history

diff --cc mutt/.mutt/muttrc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.