]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' into tc202
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Jul 2013 00:12:23 +0000 (02:12 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Jul 2013 00:12:23 +0000 (02:12 +0200)
commitd0a445299ed2ae593599d0a09a1e75843f62543a
treeba4c8b5a50b481fd738f22bee2f69116edafa902
parent6513ea37bd7c4932bbd7c58dc6b5b45487e71521
parent89c5c0040f02afed228350f95dfedec1c1d38b50
Merge branch 'crfpa' into tc202

Conflicts:
teleforma/templates/teleforma/course_conference_record.html
teleforma/models/core.py
teleforma/templates/teleforma/course_conference_record.html
teleforma/views/core.py