Merge branch 'master' of git://git.onelab.eu/myslice
[myslice.git] / portal / platformview.py
2013-09-09 YasinFIX: conflict in settings.py
2013-09-04 Thierry ParmentelatPlatformView in platformview.py