]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b631ab 4fa6f4b)
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Wed, 4 Apr 2012 08:22:55 +0000 (10:22 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 4 Apr 2012 08:22:55 +0000 (10:22 +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.