]> wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ec43c6 1edb384)
Merge branch 'master' of ssh://www.wagner.pp.ru/work/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Mon, 11 Aug 2014 16:38:31 +0000 (20:38 +0400)
committerVictor Wagner <vitus@wagner.pp.ru>
Mon, 11 Aug 2014 16:38:31 +0000 (20:38 +0400)
1  2 
jenni.txt patch | diff1 | diff2 | blob | history

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