]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Jun 2014 20:10:24 +0000 (22:10 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Jun 2014 20:10:24 +0000 (22:10 +0200)
commitfae561af136cd3e69d91120ae96ec140ae9217ed
tree4ed968cd6a224d597b4a8afc647b69ed37f3c5e5
parent8be0b7883efa62a542393f9c13f2e29d0cd266ec
parentb8e30471d11b03b4909e8b8d2f0e183e6736a035
Merge branch 'prodev' into pro