]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2b5d14 bbf902b)
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Dec 2013 10:51:52 +0000 (11:51 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Dec 2013 10:51:52 +0000 (11:51 +0100)
1  2 
telemeta/urls.py patch | diff1 | diff2 | blob | history

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