]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into feature/telecaster
authoryomguy <yomguy@parisson.com>
Wed, 11 Jul 2012 09:33:20 +0000 (11:33 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 11 Jul 2012 09:33:20 +0000 (11:33 +0200)
commitc0112aeb0f4a96792d044537e8d1a82738d08d1e
tree6b79f7ce1ef52c21e86345ef91a65c128cbb0875
parent8c7b1be293823ba713a51efb92b90d0b2127d560
parentfb35162157fb95130bdd1fef45237ddb6d8075f9
Merge branch 'dev' into feature/telecaster

Conflicts:
example/settings.py
teleforma/templates/teleforma/inc/conference_list.html
example/settings.py
teleforma/templates/teleforma/inc/conference_list.html
teleforma/views.py