Alexis Metaireau 419a2159e6 Merge remote-tracking branch 'muffinresearch/master' ... Conflicts: docs/settings.rst tests/test_generators.py		2012-05-11 16:17:47 +02:00
..
static	Merge remote-tracking branch 'muffinresearch/master'	2012-05-11 16:17:47 +02:00
templates	Fixed hardcoded category url in base.html.	2012-04-10 17:30:42 +08:00