]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into feature/blue
authoryomguy <yomguy@parisson.com>
Thu, 5 Jul 2012 17:36:58 +0000 (19:36 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 5 Jul 2012 17:36:58 +0000 (19:36 +0200)
commit3970be0538faf288b989171a0103e62f33614d01
tree3c0e4ddd80e80f7b393d582c523a2a5ca19a4c64
parentf9db3b2ce9aeba4817c2803c9893ff71f4a5b592
parenta6a6e4a1e421227b6fcbcc1105064838d01c1e24
Merge branch 'dev' into feature/blue
teleforma/static/teleforma/css/teleforma.css