]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a3aaca a9690df)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 19:51:14 +0000 (14:51 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 19:51:14 +0000 (14:51 -0500)
* remotes/upstream/master:
  remove "smilie" expansion for Diaspora logo
  prevent duplicate likes
  quattro: theme settings (a bit hackish)
  add img
  fixes in diabook
  finalise spam storage model, begin driver changes.
  fixes
  template proc: add variable filters

* master:


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