]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d5e3c6 5801fa9)
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 1 May 2015 14:43:35 +0000 (16:43 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 1 May 2015 14:43:35 +0000 (16:43 +0200)
1  2 
telemeta/views/resource.py patch | diff1 | diff2 | blob | history

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