Fix: merge conflic /portal/views.py
[myslice.git] / requirements / dev.txt
2013-07-03 Jordan Augéportal: updated models + added requirements