]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4682a0e e92b195)
Merge branch 'dev' into release/1.6.4
authorThomas Fillon <thomas@parisson.com>
Thu, 8 Jun 2017 14:40:54 +0000 (16:40 +0200)
committerThomas Fillon <thomas@parisson.com>
Thu, 8 Jun 2017 14:40:54 +0000 (16:40 +0200)
Conflicts:
lib/TimeSide


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