]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f63636e)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 5 Apr 2012 02:58:32 +0000 (22:58 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 5 Apr 2012 02:58:32 +0000 (22:58 -0400)
* remotes/upstream/master:
  well that was a stupid mistake...
  string update
  bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
  better handling of reshares containing embeds

* master:


No differences found
Unnamed repository; edit this file 'description' to name the repository.