]> wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ade4e6 4dca6cb)
Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Sun, 19 Oct 2014 20:22:36 +0000 (00:22 +0400)
committerVictor Wagner <vitus@wagner.pp.ru>
Sun, 19 Oct 2014 20:22:36 +0000 (00:22 +0400)

Trivial merge
Рани Ясмина http://www.wagner.pp.ru/~vitus/fiction/#jasmina