]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' into ae
authoryomguy <yomguy@parisson.com>
Sun, 4 Nov 2012 22:54:03 +0000 (23:54 +0100)
committeryomguy <yomguy@parisson.com>
Sun, 4 Nov 2012 22:54:03 +0000 (23:54 +0100)
commitde74fb2402c716da2b070d6ed162fa48037636bb
tree750654fcbbace4f503d917944415b07279ed4ac2
parent4ab91b60a1a75a07fc9a45ea26ce7c03c244d8f4
parent690efab41dc0819590a6bf73093439e5712a8d94
Merge branch 'dev' into ae
teleforma/admin.py