]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f63636e) | patch
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)
commitc0a18bc2fad021db026141b732b3e9a1e0ce1d71
tree165de3fbf5fd22200cae54abf3dbc3eda7685a70tree | snapshot
parentf63636ed14ccd0e88f6e01153029ff6b79c91027commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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:
Unnamed repository; edit this file 'description' to name the repository.