]> git.parisson.com Git - telemeta.git/commit
projects / telemeta.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55b6a2d 1c490d2)
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 22:49:18 +0000 (23:49 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 22:49:18 +0000 (23:49 +0100)
commit7bd2a3392d8f9387e7a95c9db03e94c2d5481269
tree15872c0560787c8e8a602c47c85eacad5334278etree | snapshot
parent55b6a2d5bf2cd8a45a48723addf911f89e3c0d98commit | diff
parent1c490d23cfcd3dc8b8f710359fa91588dc2238a7commit | diff
Merge branch 'dev' into crem

Conflicts:
telemeta/views/item.py
telemeta/views/item.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.