aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-04-05 13:39:15 +0200
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-04-05 13:39:15 +0200
commit355c42cb309eb1313097411067ca999b699aa620 (patch)
treed00d1af9dceecdf114cadff924c5ba4a864fbf43 /spec
parentcbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff)
parent9b6e91086b29554fd04362f6c87ea148718e8b1c (diff)
downloadvolse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz
volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2
volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts: include/config.php update.php
Diffstat (limited to 'spec')
-rw-r--r--[-rwxr-xr-x]spec/dfrn-snap2.jpgbin246724 -> 246724 bytes
-rw-r--r--[-rwxr-xr-x]spec/dfrn2.odtbin209276 -> 209276 bytes
-rw-r--r--[-rwxr-xr-x]spec/dfrn2.pdfbin304958 -> 304958 bytes
-rw-r--r--[-rwxr-xr-x]spec/zot.txt0
4 files changed, 0 insertions, 0 deletions
diff --git a/spec/dfrn-snap2.jpg b/spec/dfrn-snap2.jpg
index ee00f5654..ee00f5654 100755..100644
--- a/spec/dfrn-snap2.jpg
+++ b/spec/dfrn-snap2.jpg
Binary files differ
diff --git a/spec/dfrn2.odt b/spec/dfrn2.odt
index 390fc4bb8..390fc4bb8 100755..100644
--- a/spec/dfrn2.odt
+++ b/spec/dfrn2.odt
Binary files differ
diff --git a/spec/dfrn2.pdf b/spec/dfrn2.pdf
index e46225f7e..e46225f7e 100755..100644
--- a/spec/dfrn2.pdf
+++ b/spec/dfrn2.pdf
Binary files differ
diff --git a/spec/zot.txt b/spec/zot.txt
index 2c3bbb180..2c3bbb180 100755..100644
--- a/spec/zot.txt
+++ b/spec/zot.txt