]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 15 Jan 2013 09:56:19 +0000 (10:56 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 15 Jan 2013 09:56:19 +0000 (10:56 +0100)
commit5a1c05e633e940aa04697b63504b086fdc5283f8
tree5ebd564a792241e275163367cce5f76974c683d3
parent3b43b89aa3ccbc38c139b847390609c451479ce1
parent759802e351832329417870cf78c8417efbeaae3e
Merge branch 'dev' of /var/git/teleforma into prodev

Conflicts:
teleforma/context_processors.py
teleforma/templatetags/teleforma_tags.py
teleforma/templatetags/teleforma_tags.py
teleforma/views/core.py