]> git.mxchange.org Git - friendica.git/commit
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)
commitd647dbc6af33689d0baf4bafd72031d06dcf7577
treeafd4db159aa0b36bdb1e8f17581283843bd9bcd5
parent2a3aaca88ded68a8ce926577d3faea2f3ef0ab50
parenta9690dfe2d9358fcbb156644df2d12099ff798c4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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: