]> wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38033d9 3221b65)
Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Mon, 22 Feb 2016 10:54:31 +0000 (13:54 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Mon, 22 Feb 2016 10:54:31 +0000 (13:54 +0300)
1  2 
cornwallis.txt patch | diff1 | diff2 | blob | history

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