Merge branch 'master' of https://github.com/friendica/friendica
This commit is contained in:
commit
734cdcef28
3
README
3
README
|
@ -1,3 +0,0 @@
|
|||
This is my personal fork of https://github.com/friendica/friendica
|
||||
|
||||
If you want to have a stable version of friendica please look there.
|
|
@ -14,8 +14,8 @@ require_once('include/html2bbcode.php');
|
|||
function diaspora2bb($s) {
|
||||
|
||||
// for testing purposes: Collect raw markdown articles
|
||||
$file = tempnam("/tmp/friendica/", "markdown");
|
||||
file_put_contents($file, $s);
|
||||
// $file = tempnam("/tmp/friendica/", "markdown");
|
||||
// file_put_contents($file, $s);
|
||||
|
||||
$s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
|
||||
|
||||
|
|
Loading…
Reference in a new issue