]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpaold' into crfpa
authoryomguy <yomguy@parisson.com>
Fri, 8 Feb 2013 14:42:54 +0000 (15:42 +0100)
committeryomguy <yomguy@parisson.com>
Fri, 8 Feb 2013 14:42:54 +0000 (15:42 +0100)
commit5c2c46a4a2fa7f7337471158e86d8b7853546d4d
treec7b1f687e0ce1229a74b8abf10eddda38c37e491
parentb0f912980d44b6c30776cb89aa31925c34cae3dc
parentf66fc93c0a69a2d9088df3a3a319a9d835af58b5
Merge branch 'crfpaold' into crfpa

Conflicts:
teleforma/management/commands/teleforma-import-conferences.py
teleforma/management/commands/teleforma-import-courses-xls.py