Dolda2000 GitWeb / automanga.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 477d3ba d2f58cf)
Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 13 Jul 2013 05:39:39 +0000 (07:39 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 13 Jul 2013 05:39:39 +0000 (07:39 +0200)
Conflicts:
manga/mangafox.py


Trivial merge
Manga reader