aboutsummaryrefslogtreecommitdiffstats
path: root/docblox.dist.xml
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-26 20:07:54 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-26 20:07:54 -0400
commit7b5bab445de31f52504454754c3c12410537fcfd (patch)
tree733a6785377d17dc8d05d5e17e724738789c5329 /docblox.dist.xml
parent3ee998dbaf83e92dd1ceaee4d35ca942210c5e24 (diff)
downloadvolse-hubzilla-7b5bab445de31f52504454754c3c12410537fcfd.tar.gz
volse-hubzilla-7b5bab445de31f52504454754c3c12410537fcfd.tar.bz2
volse-hubzilla-7b5bab445de31f52504454754c3c12410537fcfd.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: diabook-themes: small-fix add link "remove account" to /mod/settings.php * master:
Diffstat (limited to 'docblox.dist.xml')
0 files changed, 0 insertions, 0 deletions