]> 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: d2929ec c795384)
Merge branch 'master' of file:///work/git/fiction/Kate-the-Empress
authorVictor Wagner <vitus@wagner.pp.ru>
Sat, 21 Dec 2013 11:33:53 +0000 (15:33 +0400)
committerVictor Wagner <vitus@wagner.pp.ru>
Sat, 21 Dec 2013 11:33:53 +0000 (15:33 +0400)

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