]> wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c5fad6 8e35449)
Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Wed, 24 Feb 2016 19:31:39 +0000 (22:31 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Wed, 24 Feb 2016 19:31:39 +0000 (22:31 +0300)

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