]> 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: 2b0c49c f1dff3f)
fix merge conflict
authorVictor Wagner <vitus@wagner.pp.ru>
Fri, 29 Jan 2016 19:39:10 +0000 (22:39 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Fri, 29 Jan 2016 19:39:10 +0000 (22:39 +0300)

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