aboutsummaryrefslogtreecommitdiffstats
path: root/view/admin_aside.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-28 20:16:25 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-28 20:16:25 -0400
commitecd1dab373a1fccb1663023f6515ed148475079d (patch)
tree144978a5312ec9d81cd43fbf74a99fd4789922fb /view/admin_aside.tpl
parent9413900a9f9cb3c455ee4f0300224dec3a4a9f75 (diff)
parent8a112aee0012383c5328021a5b0637957439cbaa (diff)
downloadvolse-hubzilla-ecd1dab373a1fccb1663023f6515ed148475079d.tar.gz
volse-hubzilla-ecd1dab373a1fccb1663023f6515ed148475079d.tar.bz2
volse-hubzilla-ecd1dab373a1fccb1663023f6515ed148475079d.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: a few more continues that should be returns small bugfix. sometimes also avatar pics were rescaled * master:
Diffstat (limited to 'view/admin_aside.tpl')
0 files changed, 0 insertions, 0 deletions