diff options
| author | Dan McGee <dan@archlinux.org> | 2012-03-24 02:19:34 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-03-24 02:19:34 +0100 |
| commit | 822898e57bc6d4e008ef58da309857e9ef8c98e6 (patch) | |
| tree | 1af0836c927b87e2249628d47cdfefe77c3b18fd /templates/news | |
| parent | ea87160c397fe1daf63851f0ed0be146bea79196 (diff) | |
| parent | 8e10699d53281be53c88a3695de6aa496e084dc6 (diff) | |
| download | archweb-822898e57bc6d4e008ef58da309857e9ef8c98e6.tar.gz archweb-822898e57bc6d4e008ef58da309857e9ef8c98e6.tar.xz | |
Merge branch 'django14'
Conflicts:
templates/releng/result_section.html
Diffstat (limited to 'templates/news')
0 files changed, 0 insertions, 0 deletions