aboutsummaryrefslogtreecommitdiffstats
path: root/spec/dfrn-snap2.jpg
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-12-18 18:21:47 +0000
committerThomas Willingham <founder@kakste.com>2013-12-18 18:21:47 +0000
commit7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch)
tree03b41e86e0790895fe56488beea2b5f554fbaeae /spec/dfrn-snap2.jpg
parent733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff)
parentdf34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff)
downloadvolse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: mod/page.php
Diffstat (limited to 'spec/dfrn-snap2.jpg')
-rw-r--r--spec/dfrn-snap2.jpgbin246724 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/spec/dfrn-snap2.jpg b/spec/dfrn-snap2.jpg
deleted file mode 100644
index ee00f5654..000000000
--- a/spec/dfrn-snap2.jpg
+++ /dev/null
Binary files differ