]> git.parisson.com Git - telemeta-doc.git/commit
Merge branch 'master' of github.com:Parisson/Telemeta-doc master
authorThomas Fillon <thomas@parisson.com>
Fri, 18 Aug 2017 12:32:02 +0000 (14:32 +0200)
committerThomas Fillon <thomas@parisson.com>
Fri, 18 Aug 2017 12:32:02 +0000 (14:32 +0200)
commite1187ddf8dd85d07cdb293359c2dcf6ceaf47fef
tree5d8035ba4a929677956da522fe99ca393c724198
parent0f81720217c3db0441ba4e683526b848d1262153
parenta6c5c74055e1c0178a6e4001b0b8af11115b4abe
Merge branch 'master' of github.com:Parisson/Telemeta-doc

Conflicts:
Conferences/2015_WAC/submission.rst