]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into feature/blue
authoryomguy <yomguy@parisson.com>
Thu, 5 Jul 2012 17:19:14 +0000 (19:19 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 5 Jul 2012 17:19:14 +0000 (19:19 +0200)
commit1bd3ce038f4486bbb7980d00eb72b59ef1e2f603
treedef7e1634f93841c95dcacc66246aa1f87f4f99b
parenta391925976459a54a08f6a40b25baaf5de906251
parentd5b9142e81a1baee7ea2eb518dcc7d353fd1a743
Merge branch 'dev' into feature/blue
teleforma/static/teleforma/css/teleforma.css