]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f41ebb8 e12b60a)
Merge branch 'master' of /var/git/telemeta
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Apr 2012 14:31:12 +0000 (16:31 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Apr 2012 14:31:12 +0000 (16:31 +0200)
1  2 
telemeta/views/base.py patch | diff1 | diff2 | blob | history

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