Dan McGee f85cc0482a Merge branch 'django-1.5' ... Conflicts: requirements.txt requirements_prod.txt		2013-02-26 18:45:14 -06:00
..
add.html	Remove {% load url from future %} from templates	2013-02-09 16:20:38 -06:00
iso_overview.html	Remove {% load url from future %} from templates	2013-02-09 16:20:38 -06:00
release_detail.html	Remove {% load url from future %} from templates	2013-02-09 16:20:38 -06:00
release_list.html	Remove {% load url from future %} from templates	2013-02-09 16:20:38 -06:00
result_list.html	Merge branch 'django-1.5'	2013-02-26 18:45:14 -06:00
result_section.html	Remove {% load url from future %} from templates	2013-02-09 16:20:38 -06:00
results.html	Remove {% load url from future %} from templates	2013-02-09 16:20:38 -06:00
thanks.html	Remove {% load url from future %} from templates	2013-02-09 16:20:38 -06:00