]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6791f2 14dc8a4)
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 16 Jan 2013 16:46:32 +0000 (17:46 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 16 Jan 2013 16:46:32 +0000 (17:46 +0100)
1  2 
teleforma/views/core.py patch | diff1 | diff2 | blob | history

diff --cc teleforma/views/core.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.