]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 451a0fd 6369a60)
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Sep 2013 14:39:26 +0000 (16:39 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Sep 2013 14:39:26 +0000 (16:39 +0200)
Conflicts:
teleforma/templatetags/teleforma_tags.py

1  2 
teleforma/templatetags/teleforma_tags.py patch | diff1 | diff2 | blob | history

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