]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 25 Mar 2012 04:59:25 +0000 (00:59 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 25 Mar 2012 04:59:25 +0000 (00:59 -0400)
commit5bd4f62210c9672dd7d502cf8a74ee34727536fc
tree1c5d43999b433007ff19bd5c591a1c9b3b027e82
parent8a6c407282fe10f676f08f21e28647a5c8794e11
parentf1cb28774230cb69b9ce8ee5b32e4e2531aa586a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #329 - compress the plugin list on the friendica info page
  bug #346 - add oembed maxwidth to oembed request

* master: