]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e4743f bcd6dc5)
Merge branch 'ae' of git+ssh://vcs.parisson.com/var/git/teleforma into ae
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 19 Nov 2013 15:04:45 +0000 (16:04 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 19 Nov 2013 15:04:45 +0000 (16:04 +0100)
Conflicts:
teleforma/views/core.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.