]> wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 335ba89 d9ec7c3)
Merge branch 'master' of http://www.wagner.pp.ru/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Sun, 6 Mar 2016 20:31:08 +0000 (23:31 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Sun, 6 Mar 2016 20:31:08 +0000 (23:31 +0300)

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