]> git.parisson.com Git - telecasting-www.git/commitdiff
projects / telecasting-www.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12300b7 6da0f66)
Merge branch 'django' of git.parisson.com:git/telecasting-www into django
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 14 Nov 2013 17:27:19 +0000 (18:27 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 14 Nov 2013 17:27:19 +0000 (18:27 +0100)

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