]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into ae
authoryomguy <yomguy@parisson.com>
Sat, 3 Nov 2012 12:38:28 +0000 (13:38 +0100)
committeryomguy <yomguy@parisson.com>
Sat, 3 Nov 2012 12:38:28 +0000 (13:38 +0100)
commit4ab91b60a1a75a07fc9a45ea26ce7c03c244d8f4
tree1365ba52cb017986f627bf1c75d277886cae74bc
parent43a2eb18c8b8f4ebfb86c00ccaa93ae10fc53f7d
parent1a57763604df360fbd082c2fdc20be84f1ac049f
Merge branch 'dev' into ae
teleforma/admin.py
teleforma/templates/teleforma/course_detail.html