diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-12-04 23:07:59 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-12-04 23:07:59 -0300 |
| commit | 988c2c6d400b3721464c2891891807d504b076b0 (patch) | |
| tree | 013dc3d676edad701d0d3bbd239bc2df0cdf76b4 /templates/public/userlist.html | |
| parent | 60a1fc6cc4cef0b9eed58ea4f0ca003b76ec382a (diff) | |
| parent | 183c4d9cefa95f46c3fa3a6936f837542426eac2 (diff) | |
Merge branch 'master' of ssh://gparabola/parabolaweb
Conflicts:
local_settings.py.example
media/archweb.css
packages/templatetags/package_extras.py
public/views.py
templates/packages/details.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/search.html
templates/public/download.html
templates/todolists/view.html
Diffstat (limited to 'templates/public/userlist.html')
| -rw-r--r-- | templates/public/userlist.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/public/userlist.html b/templates/public/userlist.html index 66543191..cfb08d80 100644 --- a/templates/public/userlist.html +++ b/templates/public/userlist.html @@ -14,7 +14,6 @@ {% with users as dev_list %} {% include 'public/developer_list.html' %} {% endwith %} - </div> {% endcache %} {% endblock %} |