aboutsummaryrefslogtreecommitdiffstats
path: root/library/colorbox/content
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-05 14:41:04 -0800
committerfriendica <info@friendica.com>2015-01-05 14:41:04 -0800
commit3df3ab563004423477640393eb8e50cb3d2fe8d6 (patch)
treeb1b82983500c69c5a097c49567e87836288f26df /library/colorbox/content
parent05a237b808783deb3fc1de2f9e2bbb7f03c60b21 (diff)
parentc45456fa3342bc72d30c20bafd029913930130aa (diff)
downloadvolse-hubzilla-3df3ab563004423477640393eb8e50cb3d2fe8d6.tar.gz
volse-hubzilla-3df3ab563004423477640393eb8e50cb3d2fe8d6.tar.bz2
volse-hubzilla-3df3ab563004423477640393eb8e50cb3d2fe8d6.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'library/colorbox/content')
-rw-r--r--library/colorbox/content/daisy.jpgbin0 -> 101126 bytes
-rw-r--r--library/colorbox/content/daisy@2x.jpgbin0 -> 335898 bytes
-rw-r--r--library/colorbox/content/homer.jpgbin8917 -> 8584 bytes
-rw-r--r--library/colorbox/content/marylou.jpgbin55125 -> 52286 bytes
-rw-r--r--library/colorbox/content/ohoopee1.jpgbin74827 -> 71685 bytes
-rw-r--r--library/colorbox/content/ohoopee2.jpgbin117411 -> 111141 bytes
-rw-r--r--library/colorbox/content/ohoopee3.jpgbin71514 -> 69240 bytes
7 files changed, 0 insertions, 0 deletions
diff --git a/library/colorbox/content/daisy.jpg b/library/colorbox/content/daisy.jpg
new file mode 100644
index 000000000..16da6bdb0
--- /dev/null
+++ b/library/colorbox/content/daisy.jpg
Binary files differ
diff --git a/library/colorbox/content/daisy@2x.jpg b/library/colorbox/content/daisy@2x.jpg
new file mode 100644
index 000000000..f2e688dc2
--- /dev/null
+++ b/library/colorbox/content/daisy@2x.jpg
Binary files differ
diff --git a/library/colorbox/content/homer.jpg b/library/colorbox/content/homer.jpg
index 87ec76c99..864c17a9f 100644
--- a/library/colorbox/content/homer.jpg
+++ b/library/colorbox/content/homer.jpg
Binary files differ
diff --git a/library/colorbox/content/marylou.jpg b/library/colorbox/content/marylou.jpg
index 4c717d276..f113fbf6c 100644
--- a/library/colorbox/content/marylou.jpg
+++ b/library/colorbox/content/marylou.jpg
Binary files differ
diff --git a/library/colorbox/content/ohoopee1.jpg b/library/colorbox/content/ohoopee1.jpg
index aae19a3e6..007fa58a8 100644
--- a/library/colorbox/content/ohoopee1.jpg
+++ b/library/colorbox/content/ohoopee1.jpg
Binary files differ
diff --git a/library/colorbox/content/ohoopee2.jpg b/library/colorbox/content/ohoopee2.jpg
index 206894489..e56bb0f32 100644
--- a/library/colorbox/content/ohoopee2.jpg
+++ b/library/colorbox/content/ohoopee2.jpg
Binary files differ
diff --git a/library/colorbox/content/ohoopee3.jpg b/library/colorbox/content/ohoopee3.jpg
index 4d64d2400..7cc1c7f97 100644
--- a/library/colorbox/content/ohoopee3.jpg
+++ b/library/colorbox/content/ohoopee3.jpg
Binary files differ