]> git.friedersdorff.com Git - max/dotfiles.git/commitdiff
projects / max / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23e5338 84769f1)
Merge branch 'master' into beryllium
authorMaximilian Friedersdorff <max@friedersdorff.com>
Wed, 26 Oct 2016 15:40:08 +0000 (16:40 +0100)
committerMaximilian Friedersdorff <max@friedersdorff.com>
Wed, 26 Oct 2016 15:40:08 +0000 (16:40 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.