diff options
| author | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 04:00:30 +0100 |
|---|---|---|
| committer | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 04:00:30 +0100 |
| commit | 4fbeb44718ca0f378baeae6fdda29388ff70b29d (patch) | |
| tree | 0b9008f684664753e7e7667b811e2246ff3e7312 /sublab_project/manage.py | |
| parent | 1347410c5125775f8b84bff0d12086158c39bea0 (diff) | |
| parent | 4d8b78ba8747804d0e090eae0674b22ba8f53198 (diff) | |
Merge branch 'master' of sublab.org:subweb
Conflicts:
sublab_project/news/templates/news/news_list.html
Diffstat (limited to 'sublab_project/manage.py')
0 files changed, 0 insertions, 0 deletions