]> rtime.felk.cvut.cz Git - edu/osp-wiki.git/commitdiff
projects / edu / osp-wiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3552b40 d66d95b)
Merge branch 'master' of rtime.felk.cvut.cz:/edu/osp-wiki
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Wed, 6 May 2015 22:34:42 +0000 (00:34 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Wed, 6 May 2015 22:34:42 +0000 (00:34 +0200)

Trivial merge
IkiWiki for Open Source Programming course