]> wagner.pp.ru Git - fiction/jasmina.git/commitdiff
projects / fiction / jasmina.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 839d9ec 32ee74b)
Merge branch 'master' of /work/git/fiction/jasmina
authorVictor Wagner <vitus@wagner.pp.ru>
Sat, 9 Aug 2014 13:19:23 +0000 (17:19 +0400)
committerVictor Wagner <vitus@wagner.pp.ru>
Sat, 9 Aug 2014 13:19:23 +0000 (17:19 +0400)

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