Xinqi Bao's Git

projects / slstatus.git / commitdiff
summary | log | commit | diff | tree
raw | combined (merge: fd36f65 f4a3833)
Merge pull request #19 from R41z/master
authorAaron Marcher <[email protected]>
Sun, 18 Sep 2016 19:44:48 +0000 (21:44 +0200)
committerGitHub <[email protected]>
Sun, 18 Sep 2016 19:44:48 +0000 (21:44 +0200)
several changes


Trivial merge