]> mj.ucw.cz Git - moe.git/commitdiff
projects / moe.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1636b31 700824d)
Merge commit '700824d3e9bce9219819e4e5096ab94da301d44b' from branch bernard/master
authorMartin Mares <mj@ucw.cz>
Wed, 9 Jul 2014 09:49:49 +0000 (11:49 +0200)
committerMartin Mares <mj@ucw.cz>
Wed, 9 Jul 2014 09:49:49 +0000 (11:49 +0200)

Trivial merge
MOE -- A modular contest system