diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-27 00:54:47 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-27 00:54:47 -0400 |
commit | cfdb2979cb5caac7806d993f63844c1314e2cdfa (patch) | |
tree | ee48bbc5adbf3a91d4303e7f2ee261b21ed9c5c3 /view/diaspora_photo.tpl | |
parent | daa036e34c6db5db34fa2f45235ffbdc0f03a252 (diff) | |
download | volse-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/diaspora_photo.tpl')
0 files changed, 0 insertions, 0 deletions