From: balastegui <thomas.balastegui@gmail.com>
Date: Tue, 24 May 2016 08:34:33 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into dev
X-Git-Tag: 1.6.2^2~17^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f05eb86851f4e0d3c11ec03e9a092922d463df04;p=telemeta.git

Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into dev

Update playlist.js
---

f05eb86851f4e0d3c11ec03e9a092922d463df04