diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-09 21:51:24 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-09 21:51:24 -0700 |
commit | 4df1ea49ec75ec9dd64bc8f58c01e64ea18bedc7 (patch) | |
tree | 91535b33cd2b62b0726821e4d217d587da7cd61b /theme/base/images | |
parent | b3628b78448266fda2368f1317e70d1cca45ac17 (diff) | |
parent | ed627bb4bd6424325478412055d295b185f9f662 (diff) |
Merge branch '0.8.x' into userdesign
Conflicts:
actions/designsettings.php
Diffstat (limited to 'theme/base/images')
-rw-r--r-- | theme/base/images/icons/twotone/green/clip-01.gif | bin | 0 -> 78 bytes |
-rw-r--r-- | theme/base/images/icons/twotone/green/clip-02.gif | bin | 0 -> 70 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/theme/base/images/icons/twotone/green/clip-01.gif b/theme/base/images/icons/twotone/green/clip-01.gif Binary files differnew file mode 100644 index 000000000..f2dee7e5e --- /dev/null +++ b/theme/base/images/icons/twotone/green/clip-01.gif diff --git a/theme/base/images/icons/twotone/green/clip-02.gif b/theme/base/images/icons/twotone/green/clip-02.gif Binary files differnew file mode 100644 index 000000000..77a729799 --- /dev/null +++ b/theme/base/images/icons/twotone/green/clip-02.gif |