]> git.parisson.com Git - telemeta-pages.git/commitdiff
projects / telemeta-pages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0da5f9 597b0b7)
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 17 Nov 2011 08:57:03 +0000 (09:57 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 17 Nov 2011 08:57:03 +0000 (09:57 +0100)
Conflicts:
telemeta/pages/en/home.rst
telemeta/pages/fr/home.rst


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.