]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/epub
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 24 Feb 2015 22:41:22 +0000 (23:41 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 24 Feb 2015 22:41:22 +0000 (23:41 +0100)
commitb9f1e7702927eaf224697f1c61bc93eaa00ffc96
tree17d96b0ea5b0d977951b504d8b1ec323029b54c0
parent67c2ae32001ee2096ffc7ac036dfb6555286a0d3
parent9f9c3cdef3b4317104a00b446abe631604c7c0b5
Merge branch 'dev' into feature/epub