diff options
author | Max Kostikov <max@kostikov.co> | 2019-12-09 18:47:55 +0100 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2019-12-09 18:47:55 +0100 |
commit | 298acb96450e6282247fafecef49ffbb0174f5ea (patch) | |
tree | deb91b84cff545a6af46cf9dc44f18273e23ae04 /Zotlabs/Lib/JSalmon.php | |
parent | 258a4e5627caf8fd1b3d89596fada2bea1490c7a (diff) | |
parent | c4f4edd743b79ec3f3bebecf786cbb6da8921ce9 (diff) | |
download | volse-hubzilla-298acb96450e6282247fafecef49ffbb0174f5ea.tar.gz volse-hubzilla-298acb96450e6282247fafecef49ffbb0174f5ea.tar.bz2 volse-hubzilla-298acb96450e6282247fafecef49ffbb0174f5ea.zip |
Merge branch 'dev' into 'dev'
directory: port censoring from zap and disable oembed in profile about
See merge request hubzilla/core!1805
Diffstat (limited to 'Zotlabs/Lib/JSalmon.php')
0 files changed, 0 insertions, 0 deletions