]> git.lizzy.rs Git - micro.git/commitdiff
projects / micro.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccff712 67ac3f1)
Merge remote-tracking branch 'refs/remotes/zyedidia/master'
authorNicolai <NicolaiSoeborg@users.noreply.github.com>
Tue, 6 Dec 2016 20:51:33 +0000 (21:51 +0100)
committerNicolai <NicolaiSoeborg@users.noreply.github.com>
Tue, 6 Dec 2016 20:51:33 +0000 (21:51 +0100)

Trivial merge
A modern and intuitive terminal-based text editor