diff options
| author | Aaron Williamson <aaron@copiesofcopies.org> | 2012-01-17 00:59:21 -0500 |
|---|---|---|
| committer | Aaron Williamson <aaron@copiesofcopies.org> | 2012-01-17 00:59:21 -0500 |
| commit | 99a270e95298b248a77b07203ab3921078bd7906 (patch) | |
| tree | 34711abf27ab7a614c92842b456bf74ec3d5d5fb /mediagoblin/static/css/extlib | |
| parent | 25b48323a86a1036112f2f33c889d5d12d5dee9c (diff) | |
| parent | 8c7701f9f1653cf4038143cfb7a497ae21edf108 (diff) | |
| download | mediagoblin-99a270e95298b248a77b07203ab3921078bd7906.tar.lz mediagoblin-99a270e95298b248a77b07203ab3921078bd7906.tar.xz mediagoblin-99a270e95298b248a77b07203ab3921078bd7906.zip | |
Merged changes with upstream
Diffstat (limited to 'mediagoblin/static/css/extlib')
| l--------- | mediagoblin/static/css/extlib/960_16_col.css | 1 | ||||
| l--------- | mediagoblin/static/css/extlib/reset.css | 2 | ||||
| l--------- | mediagoblin/static/css/extlib/text.css | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/mediagoblin/static/css/extlib/960_16_col.css b/mediagoblin/static/css/extlib/960_16_col.css deleted file mode 120000 index d4e43898..00000000 --- a/mediagoblin/static/css/extlib/960_16_col.css +++ /dev/null @@ -1 +0,0 @@ -../../../../extlib/960.gs/960_16_col.css
\ No newline at end of file diff --git a/mediagoblin/static/css/extlib/reset.css b/mediagoblin/static/css/extlib/reset.css index 65d06d34..6084e137 120000 --- a/mediagoblin/static/css/extlib/reset.css +++ b/mediagoblin/static/css/extlib/reset.css @@ -1 +1 @@ -../../../../extlib/960.gs/reset.css
\ No newline at end of file +../../../../extlib/reset/reset.css
\ No newline at end of file diff --git a/mediagoblin/static/css/extlib/text.css b/mediagoblin/static/css/extlib/text.css deleted file mode 120000 index 2d864de4..00000000 --- a/mediagoblin/static/css/extlib/text.css +++ /dev/null @@ -1 +0,0 @@ -../../../../extlib/960.gs/text.css
\ No newline at end of file |