]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 15 Mar 2012 19:03:31 +0000 (15:03 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 15 Mar 2012 19:03:31 +0000 (15:03 -0400)
commit1d2049a6d6fe327340da2b1298f06f9fbde183c7
treedc658393ca69ebb2f6fa3c5e927584cf1d6ee272
parent6e133e75c3ed12a4637d9cc946b1cb838619b9cc
parentf96aff5518d2d5fb726d381892893a68d8c36450
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  more recycle fixes for plaintext
  fix recycle symbol when using plaintext editor
  add links to wall, photos, events, etc to aside on networkpage, fixes in css

* master: