diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:28:49 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:28:49 -0500 |
| commit | 16e941c68ddb2d37d7e94d0c60da7e9d3dba65a0 (patch) | |
| tree | 0dc941580251a06870b9ceee159b7685c8a02795 /main/fixtures/groups.json | |
| parent | f9ae4f860ccf57e84032d7be9426331a9e06e979 (diff) | |
| parent | fbbcc8534a25d3e78ef3a319c8aeb127bc5085f0 (diff) | |
Merge tag 'release_2012-04-26'parabolaweb-2012-12-12
CSS and display related tweaks
Conflicts:
public/views.py
requirements.txt
requirements_prod.txt
templates/public/download.html
Diffstat (limited to 'main/fixtures/groups.json')
0 files changed, 0 insertions, 0 deletions