git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 0383916)
Merge branch 'master' into scheduler
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 29 Nov 2013 09:30:26 +0000 (10:30 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 29 Nov 2013 09:30:26 +0000 (10:30 +0100)
Conflicts:
plugins/googlemap/static/js/googlemap.js


No differences found
myslice (django)