]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
authoryomguy <yomguy@parisson.com>
Thu, 6 Dec 2012 11:21:40 +0000 (12:21 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 6 Dec 2012 11:21:40 +0000 (12:21 +0100)
commit862277b8915de47bf448980196b3ff647db0ea7f
tree26cba96c465eb973b2f909bca043481b90d34d41
parentfb7e40e8004eebd751d1ad5c3610d1474c78757f
parent912753cf104bacf422152c7d4bf330d436aa8575
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev

Conflicts:
teleforma/context_processors.py