]> git.friedersdorff.com Git - max/dotfiles.git/commit
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)
commitc801d445d62d85d841ca22e0af546ef9f0821228
tree99ab84a0897c228a7ec27c174dff71dda9104b65
parentf797c01026f5190d27dcac56b2976f26cd91584a
parent04049574d9402109c0661093d2f90ee1b15104f5
Merge branch 'master' of github.com:maxf130/dotfiles

Conflicts:
mutt/.mutt/muttrc
mutt/.mutt/muttrc