Merge branch 'master' of ssh://git.onelab.eu/git/myslice
[myslice.git] / requirements.txt
2013-09-09 YasinFIX: conflict in settings.py
2013-07-03 Jordan Augéportal: updated models + added requirements