Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Wed, 13 Nov 2013 05:29:26 +0000 (06:29 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 13 Nov 2013 05:29:26 +0000 (06:29 +0100)
commite6184193b74ac6d5c52289546dae9121bdd99008
tree1e29f58ca9044660e02c106774eea60f3eea912b
parent3167207804460a2c42e1e5a8346c597f9832d295
parent6d69d05d59181fa58cb00db2335256a373f794fd
Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
unfold/page.py
unfold/static/css/onelab_marko.css
portal/templates/contact.html
portal/templates/registration_view.html
portal/templates/slice-request-view.html
ui/templates/base.html
unfold/page.py
unfold/static/css/onelab_marko.css