Dolda2000 GitWeb / automanga.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24f0a3b 1e28222)
Merge branch 'master' of git.dolda2000.com:/srv/git/r/automanga
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 4 May 2014 21:00:50 +0000 (23:00 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 4 May 2014 21:00:50 +0000 (23:00 +0200)
Conflicts:
automanga


Trivial merge
Manga reader