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)
1  2 
auf_savoirs_en_partage/chercheurs/models.py
auf_savoirs_en_partage/settings.py

Simple merge