]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80c884c e5d348a)
Merge branch 'dev' of github.com:Parisson/Telemeta into feature/haystack
authorafilsaime <shadow_kungfu@hotmail.fr>
Thu, 30 Apr 2015 10:11:13 +0000 (12:11 +0200)
committerafilsaime <shadow_kungfu@hotmail.fr>
Thu, 30 Apr 2015 10:11:13 +0000 (12:11 +0200)
1  2 
telemeta/urls.py patch | diff1 | diff2 | blob | history
telemeta/views/item.py patch | diff1 | diff2 | blob | history

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