diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-28 06:05:54 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-28 06:05:54 -0400 |
| commit | 2a244be9ac61ae0adbdc4d0805c0c784a102da4c (patch) | |
| tree | c23f9de8a4efa1c7dfbe1b404591cbc6ba5b1af9 /include/html2plain.php | |
| parent | c32ee4d226dec11d881dd5c68eda073e87780c12 (diff) | |
| download | volse-hubzilla-2a244be9ac61ae0adbdc4d0805c0c784a102da4c.tar.gz volse-hubzilla-2a244be9ac61ae0adbdc4d0805c0c784a102da4c.tar.bz2 volse-hubzilla-2a244be9ac61ae0adbdc4d0805c0c784a102da4c.zip | |
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:
Diffstat (limited to 'include/html2plain.php')
0 files changed, 0 insertions, 0 deletions