]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 2 May 2012 16:49:00 +0000 (12:49 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 2 May 2012 16:49:00 +0000 (12:49 -0400)
commit02dc116a9c646ea5683b8df199a7ff492ae6cfcb
treeae81849bd1bcd92acd2040cb65e3b193ec5aabb8
parentb3680c0d266f06d2474cb45750b0486d246a8315
parent6875f54647cbbdb66e6d570cbf357a8b83644fad
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
  diabook-theme: tryied to improve performance a bit
  diabook-theme: fix footer/impressum
  missing param
  provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
  delineate the new profile changes from the rest of the text
  how did that happen?
  shuffle results of remote_common_friends widget
  only validate once
  perform basic validation

* master: