]> wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a5f871 11775fd)
Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
authorVictor Wagner <wagner@atlas-card.ru>
Wed, 17 Sep 2014 11:20:05 +0000 (15:20 +0400)
committerVictor Wagner <wagner@atlas-card.ru>
Wed, 17 Sep 2014 11:20:05 +0000 (15:20 +0400)
1  2 
story.txt patch | diff1 | diff2 | blob | history

diff --cc story.txt
Simple merge
Рани Ясмина http://www.wagner.pp.ru/~vitus/fiction/#jasmina