]> 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: 57ec81d 653dae3)
Merge branch 'master' of https://www.wagner.pp.ru/git/fiction/Kate-the-Empress
authorVictor Wagner <vitus@wagner.pp.ru>
Mon, 4 Jul 2016 08:33:19 +0000 (11:33 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Mon, 4 Jul 2016 08:33:19 +0000 (11:33 +0300)

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