/portal/urls.py: Merge conflict solved
[myslice.git] / portal / tests /
2013-07-07 Jordan Augéportal.dashboard: working
2013-07-04 Jordan Augétests: added send email