]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05d6f9e ef72a4d)
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Mon, 2 Apr 2012 10:36:43 +0000 (12:36 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 2 Apr 2012 10:36:43 +0000 (12:36 +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.