diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-11 17:53:23 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-11 17:53:23 -0400 |
commit | 99f8501d321ae9d8087abbe6523e28ce5fd095d3 (patch) | |
tree | fb721b4360f0748df3cb3b522565ad4566422555 /theme/pigeonthoughts/images | |
parent | 7f0e57598a5837bbb87f197baa147be29c7df531 (diff) | |
parent | 251fd2c232d96ea09db971a6608231c679395c01 (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Conflicts:
config.php.sample
Diffstat (limited to 'theme/pigeonthoughts/images')
-rw-r--r-- | theme/pigeonthoughts/images/illustrations/illu_pigeons-01.png | bin | 0 -> 72649 bytes |
-rw-r--r-- | theme/pigeonthoughts/images/illustrations/illu_pigeons-02.png | bin | 0 -> 3538 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/theme/pigeonthoughts/images/illustrations/illu_pigeons-01.png b/theme/pigeonthoughts/images/illustrations/illu_pigeons-01.png Binary files differnew file mode 100644 index 000000000..4fdaaeb25 --- /dev/null +++ b/theme/pigeonthoughts/images/illustrations/illu_pigeons-01.png diff --git a/theme/pigeonthoughts/images/illustrations/illu_pigeons-02.png b/theme/pigeonthoughts/images/illustrations/illu_pigeons-02.png Binary files differnew file mode 100644 index 000000000..187c6c8a6 --- /dev/null +++ b/theme/pigeonthoughts/images/illustrations/illu_pigeons-02.png |