aboutsummaryrefslogtreecommitdiffstats
path: root/view/lostpass.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-21 21:23:40 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-21 21:23:40 -0400
commit867e3b33d11a8403ce2d7eda567b8eb7ba58bda7 (patch)
tree1a91309205c5659516b0a7daab0d478db82b846a /view/lostpass.tpl
parentf570965ebe65fe7d549cafea5f5d8c04da3d986f (diff)
parent9ca3ac6e61ff57a2bc615b133a64b0a7f66b3c41 (diff)
downloadvolse-hubzilla-867e3b33d11a8403ce2d7eda567b8eb7ba58bda7.tar.gz
volse-hubzilla-867e3b33d11a8403ce2d7eda567b8eb7ba58bda7.tar.bz2
volse-hubzilla-867e3b33d11a8403ce2d7eda567b8eb7ba58bda7.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: rev update, bug 428, 429, and ability to block globaldir submissions from demo sites * master:
Diffstat (limited to 'view/lostpass.tpl')
0 files changed, 0 insertions, 0 deletions