git.onelab.eu Git - myslice.git/commit

git://git.onelab.eu / myslice.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2137aea 43da604)

author	Loic & Edelberto <loic.baron@lip6.fr>
	Wed, 16 Jul 2014 09:42:56 +0000 (06:42 -0300)
committer	Loic & Edelberto <loic.baron@lip6.fr>
	Wed, 16 Jul 2014 09:42:56 +0000 (06:42 -0300)
commit	f6f7b21b464c7308f7d5f9b5335862d7bee4903d
tree	3b3534902d5795793cbd7fddb47273b6b9c54308	tree \| snapshot
parent	2137aea5dfd102f1b211ec3138d8d5f639f3c28b	commit \| diff
parent	43da604014833e14325c327a0ea60c04bf112526	commit \| diff

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

Conflicts:
apache/unfold.wsgi
myslice/settings.py
myslice/urls.py
setup.py
ui/templates/messages-transient-header.html

apache/unfold.wsgi	diff1 \|	diff2 \|	blob \| history
myslice/settings.py	diff1 \|	diff2 \|	blob \| history
myslice/urls.py	diff1 \|	diff2 \|	blob \| history
portal/actions.py	diff1 \|	diff2 \|	blob \| history
portal/homeview.py	diff1 \|	diff2 \|	blob \| history
portal/registrationview.py	diff1 \|	diff2 \|	blob \| history
portal/templates/base.html	diff1 \|	diff2 \|	blob \| history
portal/templates/onelab/onelab_base.html	diff1 \|	diff2 \|	blob \| history

myslice (django)