]> www.wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6030380 8967b6f)
Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Sun, 28 Sep 2014 18:02:14 +0000 (22:02 +0400)
committerVictor Wagner <vitus@wagner.pp.ru>
Sun, 28 Sep 2014 18:02:14 +0000 (22:02 +0400)
1  2 
jenni.txt patch | diff1 | diff2 | blob | history

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