OSDN Git Service

Merge branch 'master' of https://github.com/fluxer/katie
authorIvailo Monev <xakepa10@gmail.com>
Mon, 8 Feb 2016 11:00:21 +0000 (13:00 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Mon, 8 Feb 2016 11:00:21 +0000 (13:00 +0200)
commit9ed376ee881e4bdcaca3f3cf9a4f3968ce7401a6
tree406a4c90751ddf22ca5e628a803caad42db77d3f
parentd38d30912792da8edbac7495e60524b9ae822f24
parentcf3c3509daac1f9be635cb972bbaaa20aea0a927
Merge branch 'master' of https://github.com/fluxer/katie