From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 28 Mar 2012 10:05:54 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2a244be9ac61ae0adbdc4d0805c0c784a102da4c;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  filer: replace "file as" prompt with combobox opened in fancybox
  filer: info() on item filed
  template: field_combobox

* master:
---