aboutsummaryrefslogtreecommitdiffstats
path: root/view/xrd_diaspora.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-27 00:54:47 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-27 00:54:47 -0400
commitcfdb2979cb5caac7806d993f63844c1314e2cdfa (patch)
treeee48bbc5adbf3a91d4303e7f2ee261b21ed9c5c3 /view/xrd_diaspora.tpl
parentdaa036e34c6db5db34fa2f45235ffbdc0f03a252 (diff)
downloadvolse-hubzilla-cfdb2979cb5caac7806d993f63844c1314e2cdfa.tar.gz
volse-hubzilla-cfdb2979cb5caac7806d993f63844c1314e2cdfa.tar.bz2
volse-hubzilla-cfdb2979cb5caac7806d993f63844c1314e2cdfa.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: @-completion bug qcomment enhancements theme description with preview (non-translatable unfortunately) preparation for some possibly killer features translate br with extra elements revup Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK. * master:
Diffstat (limited to 'view/xrd_diaspora.tpl')
0 files changed, 0 insertions, 0 deletions