git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: f6f7b21)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic & Edelberto <loic.baron@lip6.fr>
Wed, 16 Jul 2014 09:42:56 +0000 (06:42 -0300)
committerLoic & Edelberto <loic.baron@lip6.fr>
Wed, 16 Jul 2014 09:42:56 +0000 (06:42 -0300)
Conflicts:
apache/unfold.wsgi
myslice/settings.py
myslice/urls.py
setup.py
ui/templates/messages-transient-header.html


No differences found
myslice (django)