OSDN Git Service

Merge branch 'master' into logo-white-compress
authorKevin Lyda <kevin@ie.suberic.net>
Sun, 5 Jan 2014 13:53:08 +0000 (13:53 +0000)
committerKevin Lyda <kevin@ie.suberic.net>
Sun, 5 Jan 2014 13:53:08 +0000 (13:53 +0000)
commit284546b2e00639bfa5e965f6a846cf308752d58e
tree7a9f96e99fa67b718527a768a0c545c63f5ccf2b
parentdcaedb4a5e3dae774e0211935977cf4514e2a928
parentd28ee0df124d79e9d0968c3325ae010b55d4a7b6
Merge branch 'master' into logo-white-compress

Conflicts:
app/assets/images/logo-black.png
app/assets/images/logo-white.png