]> git.parisson.com Git - telemeta-doc.git/commitdiff
projects / telemeta-doc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f81720 a6c5c74)
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)
Conflicts:
Conferences/2015_WAC/submission.rst


Trivial merge
Articles, conference papers and other documents related to Telemeta and TimeSide