git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 43a4dfd)
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorBruno Soares da Silva <brunosoares.inf@gmail.com>
Tue, 16 Sep 2014 21:47:39 +0000 (18:47 -0300)
committerBruno Soares da Silva <brunosoares.inf@gmail.com>
Tue, 16 Sep 2014 21:47:39 +0000 (18:47 -0300)
Conflicts:
portal/actions.py
portal/lsapiclient.py


No differences found
myslice (django)