OSDN Git Service

Merge branch 'master' of https://github.com/fluxer/katie
authorIvailo Monev <xakepa10@gmail.com>
Thu, 10 Mar 2016 16:04:58 +0000 (16:04 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Thu, 10 Mar 2016 16:04:58 +0000 (16:04 +0000)
commit97e84b50bd5430b9926304d1cc86ed8fae9b211a
tree6efc8747da03c1c9c6c69a754a99d07ab87b652e
parent99475ae659c6f512a01e848dd3aad15dc1498a75
parent61cb795736fa259928f060dde6216bd11538f6de
Merge branch 'master' of https://github.com/fluxer/katie