]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7db4221 adbfc13)
Merge branch 'master' of /var/git/telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Dec 2013 22:27:00 +0000 (23:27 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 29 Dec 2013 22:27:00 +0000 (23:27 +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.