]> www.fi.muni.cz Git - tinyboard.git/commitdiff
https://www.fi.muni.cz/~kas/git / tinyboard.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 678dd60 0c777e2)
Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/tinyboard
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 10 May 2013 20:14:12 +0000 (22:14 +0200)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 10 May 2013 20:14:12 +0000 (22:14 +0200)
 especially if it merges an updated upstream into a topic branch.


Trivial merge
Tinyboard: see http://www.fi.muni.cz/~kas/tinyboard/