]> www.wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f30e45 cf9c17d)
Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Fri, 28 Jul 2017 15:53:43 +0000 (18:53 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Fri, 28 Jul 2017 15:53:43 +0000 (18:53 +0300)

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