]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb7e40e 912753c)
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
authoryomguy <yomguy@parisson.com>
Thu, 6 Dec 2012 11:21:40 +0000 (12:21 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 6 Dec 2012 11:21:40 +0000 (12:21 +0100)
Conflicts:
teleforma/context_processors.py


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