Merge branch 'feat-rappels' into dev
authorPA Parent <paparent@paparent.me>
Wed, 19 Oct 2011 13:53:57 +0000 (09:53 -0400)
committerPA Parent <paparent@paparent.me>
Wed, 19 Oct 2011 13:53:57 +0000 (09:53 -0400)
commit75828b615ed3f788804a509954baff0fd80665a1
tree771d467c3e7d5adf029222fb10dbfdbd27d883f2
parent7b0b2f9684153aafe5222050480f650c9eaaac36
parenta2e34fdd5ecb3277cc3c344619f7694e65086484
Merge branch 'feat-rappels' into dev
auf_savoirs_en_partage/chercheurs/models.py
auf_savoirs_en_partage/settings.py