diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:38:44 -0500 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:38:44 -0500 |
commit | 415ca107fd61562dcec41fb336efdfde58d32c8b (patch) | |
tree | 23860d3717823e3dd47304b8ee8ab2b741097f7d /.gitmodules | |
parent | a33ca0a7318cf727b5c605c381e4c6f20463ad3e (diff) | |
parent | 496a0ce4d110e5a777861aff7cd4c82fe2308c89 (diff) | |
download | volse-hubzilla-415ca107fd61562dcec41fb336efdfde58d32c8b.tar.gz volse-hubzilla-415ca107fd61562dcec41fb336efdfde58d32c8b.tar.bz2 volse-hubzilla-415ca107fd61562dcec41fb336efdfde58d32c8b.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions