aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-27 04:15:27 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-27 04:15:27 -0400
commit014e832db0ab9455adc400e892b7c8a5e2092948 (patch)
treeec3b3d087b65298ccdc0e1acd51fde9d02a805d7
parent153534bc700e95bd3c248a1e094319dbf57ca297 (diff)
downloadvolse-hubzilla-014e832db0ab9455adc400e892b7c8a5e2092948.tar.gz
volse-hubzilla-014e832db0ab9455adc400e892b7c8a5e2092948.tar.bz2
volse-hubzilla-014e832db0ab9455adc400e892b7c8a5e2092948.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: fix view contacts * master:
0 files changed, 0 insertions, 0 deletions