]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 28 Mar 2012 10:05:54 +0000 (06:05 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 28 Mar 2012 10:05:54 +0000 (06:05 -0400)
commit2a244be9ac61ae0adbdc4d0805c0c784a102da4c
treec23f9de8a4efa1c7dfbe1b404591cbc6ba5b1af9
parentc32ee4d226dec11d881dd5c68eda073e87780c12
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: