diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
| commit | 5e1a9ad04d4e10ee44881a26ea72c9a80f748188 (patch) | |
| tree | 78b7f4287d00a2ff32cf6adf82c6289a5d3b6b95 /theme/base/images | |
| parent | 817f01c3b18ec626701de2a1402562eeb87eee6d (diff) | |
| parent | ee4ea3f3e1eb64df2dd3ba677f5201f8787482a8 (diff) | |
Merge branch 'testing'
Conflicts:
theme/base/css/display.css
Diffstat (limited to 'theme/base/images')
| -rw-r--r-- | theme/base/images/icons/icons-01.gif | bin | 3607 -> 3650 bytes |
| -rw-r--r-- | theme/base/images/icons/twotone/green/key.gif | bin | 0 -> 76 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif Binary files differindex 06202a047..f93d33d79 100644 --- a/theme/base/images/icons/icons-01.gif +++ b/theme/base/images/icons/icons-01.gif diff --git a/theme/base/images/icons/twotone/green/key.gif b/theme/base/images/icons/twotone/green/key.gif Binary files differnew file mode 100644 index 000000000..ccf357ab2 --- /dev/null +++ b/theme/base/images/icons/twotone/green/key.gif |
