diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
| commit | a1183bf09a93459282078038b94ef89c00297604 (patch) | |
| tree | 2e14bec170e37c6615fcd5ff2892233ddffce452 /app | |
| parent | 7fc2b13fe605ad461f6b6aeacd6a187c1ef794de (diff) | |
| parent | 1789c3242adcf11fe37f0ef0ec6180966853eeda (diff) | |
| download | volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.gz volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.bz2 volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.zip | |
Merge remote-tracking branch 'upstream/dev' into embedphotos
Diffstat (limited to 'app')
| -rw-r--r-- | app/wiki.apd | 4 | ||||
| -rw-r--r-- | app/wiki.png | bin | 0 -> 10668 bytes |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/wiki.apd b/app/wiki.apd new file mode 100644 index 000000000..95245055c --- /dev/null +++ b/app/wiki.apd @@ -0,0 +1,4 @@ +url: $baseurl/wiki/$nick +requires: local_channel +name: Wiki +photo: $baseurl/app/wiki.png diff --git a/app/wiki.png b/app/wiki.png Binary files differnew file mode 100644 index 000000000..31d981679 --- /dev/null +++ b/app/wiki.png |
