Fix: merge conflict
[myslice.git] / plugins / pres_view / daemon-todo / eventc.py
2013-09-09 YasinFIX: conflict in settings.py
2013-08-05 Jordan Augéadded pres_view