aboutsummaryrefslogtreecommitdiffstats
path: root/view/xrd_diaspora.tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-05 21:43:38 -0700
committerfriendica <info@friendica.com>2012-04-05 21:43:38 -0700
commit4bee1859be5fbf46ecc19728a908e31b4e9b09b6 (patch)
tree8b0e987e0fc2359fb5b06dba2caace51dfb889ae /view/xrd_diaspora.tpl
parent6bc7e6e09f2f21c5e75be3ef4dc70a6e84a7df09 (diff)
parent355c42cb309eb1313097411067ca999b699aa620 (diff)
downloadvolse-hubzilla-4bee1859be5fbf46ecc19728a908e31b4e9b09b6.tar.gz
volse-hubzilla-4bee1859be5fbf46ecc19728a908e31b4e9b09b6.tar.bz2
volse-hubzilla-4bee1859be5fbf46ecc19728a908e31b4e9b09b6.zip
Merge branch 'pull'
Diffstat (limited to 'view/xrd_diaspora.tpl')
-rw-r--r--[-rwxr-xr-x]view/xrd_diaspora.tpl0
1 files changed, 0 insertions, 0 deletions
diff --git a/view/xrd_diaspora.tpl b/view/xrd_diaspora.tpl
index 25cda533c..25cda533c 100755..100644
--- a/view/xrd_diaspora.tpl
+++ b/view/xrd_diaspora.tpl