OSDN Git Service

Merge branch 'master' of https://github.com/fluxer/katie
authorIvailo Monev <xakepa10@laimg.moc>
Mon, 31 Oct 2016 23:24:19 +0000 (23:24 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Mon, 31 Oct 2016 23:24:19 +0000 (23:24 +0000)
commit3ff87a15067f9ad2e2959b4b52dd29cdbe933789
tree7aacae34ba5198045523fdcb0aabc69ecb7296da
parent42d41cacbad9594dd735e4f2b1957e9227bd37a2
parentcc038f99f868b936d1b6530fd4ab3008feee1bc2
Merge branch 'master' of https://github.com/fluxer/katie