OSDN Git Service

Merge branch 'master' of https://github.com/fluxer/katie
authorIvailo Monev <xakepa10@gmail.com>
Sat, 11 Jun 2016 21:01:19 +0000 (21:01 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Sat, 11 Jun 2016 21:01:19 +0000 (21:01 +0000)
commitfaac5028017da0a879ca931b532f7a50b7c675e1
treedf9057e2b53859a673c5cc4a51af0ab1335ae7b5
parent655a87a53c9a836a52f37a94fb2f5de453ea2520
parent46ee66ac3281f7f9d479b20c386dcb372b42277e
Merge branch 'master' of https://github.com/fluxer/katie