]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be202df adb913e)
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 22:49:43 +0000 (23:49 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 22:49:43 +0000 (23:49 +0100)
Conflicts:
telemeta/views/collection.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.