git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b0773f0)
Merge remote-tracking branch 'origin/onelab' into onelab
authorJavier García <javier.garcial.external@atos.net>
Tue, 21 Apr 2015 15:43:56 +0000 (17:43 +0200)
committerJavier García <javier.garcial.external@atos.net>
Tue, 21 Apr 2015 15:43:56 +0000 (17:43 +0200)
Conflicts:
myslice/settings.py
portal/sliceresourceview.py


No differences found
myslice (django)