/portal/urls.py: Merge conflict solved
[myslice.git] / requirements.txt
2013-07-03 Jordan Augéportal: updated models + added requirements