]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into crfpa
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Feb 2015 09:07:29 +0000 (10:07 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Feb 2015 09:07:29 +0000 (10:07 +0100)
commitb6060939202563059224579adf857e3b967493c7
tree12a9ac7eb2ebca3ea16ec3571dbe335780fdd100
parent5271eb3f7d83c5fd0355cb57dca1a6fa53494838
parent62deecbcf26219780e94d8bf5850ef063812949e
Merge branch 'dev' into crfpa
teleforma/templates/telemeta/base.html