aboutsummaryrefslogtreecommitdiffstats
path: root/view/diaspora_photo.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-11 20:39:06 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-11 20:39:06 -0400
commit534a93f81c34b4b280986ad7e1bcee4278ea9299 (patch)
tree01a59f25ace68cc384828e565e96f4d1e9715619 /view/diaspora_photo.tpl
parent9c53a311de2899ca620bfaf75c58a514c55cacff (diff)
parent2454028ef61a3ea1dd8308896c8bbf1f04f97ac9 (diff)
downloadvolse-hubzilla-534a93f81c34b4b280986ad7e1bcee4278ea9299.tar.gz
volse-hubzilla-534a93f81c34b4b280986ad7e1bcee4278ea9299.tar.bz2
volse-hubzilla-534a93f81c34b4b280986ad7e1bcee4278ea9299.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: Darkzero - fixed notifications bar. diabook-theme: update mapquery and small fix diabook-theme: add "population density 2010"-layer to EarthLayers-box fix search/new against possible email leakage better test of email reply visibility diabook-theme:small fix moderated comment templates diabook-theme: small fix diabook-theme: include prv_message autocomplete fix PM replies after autocomplete changes add photos to PM autocomplete, improved appearance rev update diabook-theme: small fix * master:
Diffstat (limited to 'view/diaspora_photo.tpl')
0 files changed, 0 insertions, 0 deletions