]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 16 Jan 2013 16:46:32 +0000 (17:46 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 16 Jan 2013 16:46:32 +0000 (17:46 +0100)
commitd95a9f2c2991b63f56ff847f08dd7887126472e3
treef21e04017553c3ce8176c3d1c7a7c3f36db4db5a
parentc6791f2a76c706dfb83b9103530859e88318499c
parent14dc8a4797b9dedc5f16ca8ba60945faddb162fa
Merge branch 'prodev' of /var/git/teleforma into prodev
teleforma/views/core.py