]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c32ee4d)
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)
* remotes/upstream/master:
  filer: replace "file as" prompt with combobox opened in fancybox
  filer: info() on item filed
  template: field_combobox

* master:


No differences found
Unnamed repository; edit this file 'description' to name the repository.