]> git.parisson.com Git - teleforma.git/commit
Merge branch 'master' of git.parisson.com:git/teleforma
authorYoan Le Clanche <yoan@ellington.pilotsystems.net>
Thu, 1 Feb 2018 11:10:30 +0000 (12:10 +0100)
committerYoan Le Clanche <yoan@ellington.pilotsystems.net>
Thu, 1 Feb 2018 11:10:30 +0000 (12:10 +0100)
commite6a2a14575695caf3b6ee568987de765c8eb7a58
tree4af63497542aa501a57ae62c425e271e401ed781
parentb9e9d206e9d8307213b1ba626bb125d1b479b021
parente60ee8dc58d018eac9d1f238883676f4803eb7aa
Merge branch 'master' of git.parisson.com:git/teleforma

Conflicts:
teleforma/views/crfpa.py
teleforma/views/crfpa.py