]> git.parisson.com Git - teleforma.git/commit
Merge branch 'ae' into ae-dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 22 Aug 2013 14:53:15 +0000 (16:53 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 22 Aug 2013 14:53:15 +0000 (16:53 +0200)
commit5489fc79234349d0c606a3d1bc483b92f2d02a7d
treeee7937ca1c673097140600cf47c23e6699c66e8f
parent81c8efc13d29cd560a50330b017461d5382debb2
parent5d95404f36410e20269d8ac8bca2920e60d858e0
Merge branch 'ae' into ae-dev
re-add analytics

Conflicts:
teleforma/templates/postman/email_user_init.txt
teleforma/admin.py