]> Chaos Git - corbenik/corbenik.git/commit
Merge branch 'master' into wip/plainconf wip/plainconf 42/head
authorchaoskagami <kagami@chaos.moe>
Thu, 27 Oct 2016 15:54:34 +0000 (11:54 -0400)
committerchaoskagami <kagami@chaos.moe>
Thu, 27 Oct 2016 15:54:34 +0000 (11:54 -0400)
commit279f29e1ead62d8072ec00e20ac1ae5fed00283a
treea215d1177909a7b6a4e0d454a4d0dd5170f7182c
parentae482846274da719c3e966a1dd726290a275827b
parentf9ba3917f7f7190e1e7258686dc3869afb9d0d18
Merge branch 'master' into wip/plainconf