]> git.parisson.com Git - teleforma.git/commit
Merge branch 'feature/playicon' into dev
authoryomguy <yomguy@parisson.com>
Sun, 12 Aug 2012 08:09:44 +0000 (10:09 +0200)
committeryomguy <yomguy@parisson.com>
Sun, 12 Aug 2012 08:09:44 +0000 (10:09 +0200)
commit9655c31275b1d313ae87a29511508ea423ec48c3
tree387417133acc80f075735aab16849d2df5cd0ba1
parent86e10efb533c63a89c31c5f3872a2293b5b6edd0
parentb79947672c146165d6d3e9244edf73c383a15364
Merge branch 'feature/playicon' into dev

Conflicts:
teleforma/templates/teleforma/inc/media_list.html
teleforma/templates/teleforma/inc/media_list.html