diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-12-05 04:37:56 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-12-05 04:37:56 +0000 |
| commit | 5feeec51ce90ebef5a6c29831ca5e3cfe9b28eec (patch) | |
| tree | c8d976baab16979f3c872fd17fde1dc844d12507 /media/admin_media | |
| parent | 2d30b86b2f7afcd180f8fd0e641582ae56b1e51c (diff) | |
| parent | 7e7ef807910331b652fcb98042060d68155b9a76 (diff) | |
Merge branch 'master' of /srv/git/repositories/parabolaweb
Conflicts:
media/admin_media
Diffstat (limited to 'media/admin_media')
| l--------- | media/admin_media | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/admin_media b/media/admin_media index 4579f7fc..585cf837 120000 --- a/media/admin_media +++ b/media/admin_media @@ -1 +1 @@ -/usr/lib/python2.7/site-packages/django/contrib/admin/media/
\ No newline at end of file +/usr/lib/python2.7/site-packages/django/contrib/admin/media
\ No newline at end of file |