]> wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec8c224 524a2de)
Merge branch 'master' of /work/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Wed, 27 Aug 2014 18:54:52 +0000 (22:54 +0400)
committerVictor Wagner <vitus@wagner.pp.ru>
Wed, 27 Aug 2014 18:54:52 +0000 (22:54 +0400)

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