projects / hacks / simpleWebSlides.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fce0da 5436fe9)
Merge branch 'master' of ssh://git.nguyen.vg/hacks/simpleWebSlides
authorKim Nguyễn <kn@lri.fr>
Tue, 14 Oct 2014 10:54:51 +0000 (12:54 +0200)
committerKim Nguyễn <kn@lri.fr>
Tue, 14 Oct 2014 10:54:51 +0000 (12:54 +0200)
Conflicts:
fds/fds.xhtml


Trivial merge
A simple web framework to build HTML presentations.