]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a6c407 f1cb287)
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)
* remotes/upstream/master:
  bug #329 - compress the plugin list on the friendica info page
  bug #346 - add oembed maxwidth to oembed request

* master:


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