]> git.parisson.com Git - teleforma.git/commitdiff
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)
1  2 
teleforma/admin.py
teleforma/templates/teleforma/course_detail.html

Simple merge