]> git.deb.at Git - deb/hackedgotchi.git/commitdiff
projects / deb / hackedgotchi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fad015 7d6358b)
Merge branch 'joke' of git+ssh://git.deb.at/deb/hackedgotchi into joke
authorFrancesca Ciceri <madamezou@zouish.org>
Sat, 30 Mar 2013 20:04:07 +0000 (21:04 +0100)
committerFrancesca Ciceri <madamezou@zouish.org>
Sat, 30 Mar 2013 20:04:07 +0000 (21:04 +0100)

Trivial merge