Commit Graph

5 Commits

Author SHA1 Message Date
Aymeric Augustin 12bace46c1 [1.7.x] Avoided using private API get_template_from_string.
Conflicts:
	django/contrib/webdesign/tests.py

Backport of c0c1bb9e from master.
2014-10-31 11:43:54 +01:00
Aymeric Augustin e32095616c Imported override_settings from its new location. 2013-12-23 21:37:56 +01:00
Jason Myers c3791463a5 Fixing E302 Errors
Signed-off-by: Jason Myers <jason@jasonamyers.com>
2013-11-02 23:48:47 -05:00
Aymeric Augustin cfcf4b3605 Stopped using django.utils.unittest in the test suite.
Refs #20680.
2013-07-01 14:29:33 +02:00
Preston Timmons 3810dc3070 Modified template_tests for unittest2 discovery. 2013-04-12 15:13:59 -06:00