]> 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: 0a883cd 7a422d9)
Merge branch 'master' of https://www.wagner.pp.ru/git/fiction/Kate-the-Empress
authorVictor Wagner <vitus@wagner.pp.ru>
Fri, 26 Aug 2016 11:54:39 +0000 (14:54 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Fri, 26 Aug 2016 11:54:39 +0000 (14:54 +0300)

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