]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b53363 dd74ad4)
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Apr 2013 11:03:20 +0000 (13:03 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 16 Apr 2013 11:03:20 +0000 (13:03 +0200)
Conflicts:
telemeta/models/query.py

1  2 
telemeta/models/query.py patch | diff1 | diff2 | blob | history

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