]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 3 Jun 2012 22:03:20 +0000 (18:03 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 3 Jun 2012 22:03:20 +0000 (18:03 -0400)
commit8d4c77fc43e4d37e807248f13afb5b2913b6cfc4
tree688f64270521b0c47eaacae020e2ba92274fddeb
parent598a2563e844477de2f688663c7c46962b26b602
parent9f4b89726176f9596cf3330a68cfab8cab5ab361
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update
  database updates
  Debugged implementation of Diaspora relayable_retractions
  cleanup and logging
  first shot at getting like/unlike functions to work consistently
  Fix bugs in the retraction code
  prepare to implement database update
  Implement relaying of relayable_retractions
  Support relayable_retractions that are relayed to us by the top-level post owner
  quattro: admin panel styling and 1st buttons for addon/theme overview
  privacy settings: make submit button translateable
  DE: update to the strings
  prv messages: make submit translateable

* master: