aboutsummaryrefslogtreecommitdiffstats
path: root/view/xrd_diaspora.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-27 03:23:50 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-27 03:23:50 -0400
commita57e1e9cbcb492df05580e8cc492fe757f8df73b (patch)
tree530e49fd6e68152f5a0fc1c0eded3d3491363ccf /view/xrd_diaspora.tpl
parentcfdb2979cb5caac7806d993f63844c1314e2cdfa (diff)
parente7bc3f2bd0f578d04c271029d869e1fbc36cbec4 (diff)
downloadvolse-hubzilla-a57e1e9cbcb492df05580e8cc492fe757f8df73b.tar.gz
volse-hubzilla-a57e1e9cbcb492df05580e8cc492fe757f8df73b.tar.bz2
volse-hubzilla-a57e1e9cbcb492df05580e8cc492fe757f8df73b.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: add "find friends" to right_aside to diabook, fixes in css in diabook fixed Umlaute in de strings.php * master:
Diffstat (limited to 'view/xrd_diaspora.tpl')
0 files changed, 0 insertions, 0 deletions