first step for manual merging of the slickgrid branch
[myslice.git] / requirements / dev.txt
2013-09-09 YasinFIX: conflict in settings.py
2013-07-03 Jordan Augéportal: updated models + added requirements