Fix: merge conflict
[myslice.git] / plugins / pres_view / static / js / recup_liste.js
2013-09-09 YasinFIX: conflict in settings.py
2013-08-08 Jordan Augéunfold: better management of static files thanks to...