]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #4167 from MrPetovan/bug/4155-remove-proxy-oembed
authorMichael Vogel <icarus@dabo.de>
Thu, 4 Jan 2018 19:57:27 +0000 (20:57 +0100)
committerGitHub <noreply@github.com>
Thu, 4 Jan 2018 19:57:27 +0000 (20:57 +0100)
Add settings for OEmbed

1  2 
include/network.php
mod/admin.php

Simple merge
diff --cc mod/admin.php
Simple merge