]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 23 Apr 2012 02:22:52 +0000 (22:22 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 23 Apr 2012 02:22:52 +0000 (22:22 -0400)
commit29d7f260d7e6dc178862c6a6c16445ef9b3512e4
tree3746742dc12c2863c61c4c7cba8f4f9666590e49
parent75c228fa13d814c772db4e072dfc615eed29d206
parent2170df897b9dc72b87cc104520f6a67ddfbb994f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #388 - notify_comment received after post deleted
  don't allow non-existent themes as choices
  diabook-themes: bugfix
  diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
  api: add support for StatusNet-style media param to API
  Add a hook

* master: