git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[myslice.git]
/
.settings
/
org.eclipse.core.resources.prefs
diff --git
a/.settings/org.eclipse.core.resources.prefs
b/.settings/org.eclipse.core.resources.prefs
index
2bdc157
..
f73c991
100644
(file)
--- a/
.settings/org.eclipse.core.resources.prefs
+++ b/
.settings/org.eclipse.core.resources.prefs
@@
-1,5
+1,8
@@
eclipse.preferences.version=1
encoding//portal/django_passresetview.py=utf-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
encoding//portal/urls.py=utf-8
encoding//portal/validationview.py=utf-8
encoding//portal/views.py=utf-8