]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75c228f 2170df8)
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)
* 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:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.