From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 8 Apr 2014 17:26:40 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~151^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ed078cce90a313ddd6e5b41ecff6c14344a99220;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
	portal/templates/onelab/onelab_home-view.html
---

ed078cce90a313ddd6e5b41ecff6c14344a99220
diff --cc .settings/org.eclipse.core.resources.prefs
index 2bdc1575,2bdc1575..f73c991a
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@@ -1,5 -1,5 +1,8 @@@
  eclipse.preferences.version=1
  encoding//portal/django_passresetview.py=utf-8
++encoding//portal/forms.py=utf-8
++encoding//portal/migrations/0002_extend_slice.py=utf-8
++encoding//portal/models.py=utf-8
  encoding//portal/urls.py=utf-8
  encoding//portal/validationview.py=utf-8
  encoding//portal/views.py=utf-8