]> www.wagner.pp.ru Git - fiction/Kate-the-Empress.git/commitdiff
projects / fiction / Kate-the-Empress.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a81c837 e3afadf)
Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/Kate-the-Empress
authorVictor Wagner <wagner@atlas-card.ru>
Tue, 10 Jun 2014 13:00:32 +0000 (17:00 +0400)
committerVictor Wagner <wagner@atlas-card.ru>
Tue, 10 Jun 2014 13:00:32 +0000 (17:00 +0400)

Trivial merge
«Императрица Кэт» (мир = Галактическая Федерация)