]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e133e7 f96aff5)
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)
* 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:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.