]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:38:44 +0000 (18:38 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:38:44 +0000 (18:38 -0500)
commit415ca107fd61562dcec41fb336efdfde58d32c8b
tree23860d3717823e3dd47304b8ee8ab2b741097f7d
parenta33ca0a7318cf727b5c605c381e4c6f20463ad3e
parent496a0ce4d110e5a777861aff7cd4c82fe2308c89
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix html reshares when editplain in use

* master:
images/beard.jpg
images/smiley-beard.png
images/smiley-whitebeard.png
images/whitebeard.jpg
include/text.php