diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
| commit | 8a80ea24d1d8039be6dc532c9db23c60e71eb467 (patch) | |
| tree | 7f94f8d1e2336bbb7e69a327a003b6880f0610c0 /spec | |
| parent | c4f4715a541ad89dfd348f14c4e25a83006e74e7 (diff) | |
| parent | af7abcea2715824cbd6460a7323c8bb64bd5b829 (diff) | |
| download | volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.gz volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.bz2 volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.zip | |
Merge remote-tracking branch 'upstream/master'
Merge upstream
Diffstat (limited to 'spec')
| -rw-r--r--[-rwxr-xr-x] | spec/dfrn-snap2.jpg | bin | 246724 -> 246724 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | spec/dfrn2.odt | bin | 209276 -> 209276 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | spec/dfrn2.pdf | bin | 304958 -> 304958 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | spec/zot.txt | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/spec/dfrn-snap2.jpg b/spec/dfrn-snap2.jpg Binary files differindex ee00f5654..ee00f5654 100755..100644 --- a/spec/dfrn-snap2.jpg +++ b/spec/dfrn-snap2.jpg diff --git a/spec/dfrn2.odt b/spec/dfrn2.odt Binary files differindex 390fc4bb8..390fc4bb8 100755..100644 --- a/spec/dfrn2.odt +++ b/spec/dfrn2.odt diff --git a/spec/dfrn2.pdf b/spec/dfrn2.pdf Binary files differindex e46225f7e..e46225f7e 100755..100644 --- a/spec/dfrn2.pdf +++ b/spec/dfrn2.pdf diff --git a/spec/zot.txt b/spec/zot.txt index 2c3bbb180..2c3bbb180 100755..100644 --- a/spec/zot.txt +++ b/spec/zot.txt |
