aboutsummaryrefslogtreecommitdiffstats
path: root/spec/zot.txt
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-04 22:58:32 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-04 22:58:32 -0400
commitc0a18bc2fad021db026141b732b3e9a1e0ce1d71 (patch)
tree165de3fbf5fd22200cae54abf3dbc3eda7685a70 /spec/zot.txt
parentf63636ed14ccd0e88f6e01153029ff6b79c91027 (diff)
downloadvolse-hubzilla-c0a18bc2fad021db026141b732b3e9a1e0ce1d71.tar.gz
volse-hubzilla-c0a18bc2fad021db026141b732b3e9a1e0ce1d71.tar.bz2
volse-hubzilla-c0a18bc2fad021db026141b732b3e9a1e0ce1d71.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: well that was a stupid mistake... string update bug: diaspora_enabled setting turns it on but doesn't fully turn it off. better handling of reshares containing embeds * master:
Diffstat (limited to 'spec/zot.txt')
0 files changed, 0 insertions, 0 deletions