]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 30 Apr 2012 02:06:16 +0000 (22:06 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 30 Apr 2012 02:06:16 +0000 (22:06 -0400)
commit34eb843fb486b9487f02553c1b791892bb7615fc
tree0cc1e343310753e018c0fb36f9848f227d5eb35a
parentecd1dab373a1fccb1663023f6515ed148475079d
parentdef6f0b408680c4e5f209890bbf1ad6bf40b5add
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  the heart should really be red.
  fix location change notification
  enhanced profile reporting for single values
  add db field for removed account, which will also be the first test of update error checking
  toggle to archive unfriends, though render them useless
  indicate successful updates
  diabook-themes: small fix
  diabook-themes: bug/css-fixes
  some constants for the db update failure possibilities
  bring back the email and logging of update failures, but without the transactions

* master: