]> git.mxchange.org Git - friendica.git/commit - doc/database/db_oembed.md
Merge branch 'develop' into rewrites/coding-convention-split2-1-2
authorRoland Häder <Quix0r@users.noreply.github.com>
Wed, 19 Apr 2017 21:06:01 +0000 (23:06 +0200)
committerGitHub <noreply@github.com>
Wed, 19 Apr 2017 21:06:01 +0000 (23:06 +0200)
commitb9d8587f413d198b854ccb213521e47327088566
treeaf6e95bd4efb603ec57a3f99038a769b2adb3551
parent98edbde05cd6af228fecc8960f347bcd00cf75ad
parent5432af341423b8794bab9c00647d79507e1e985a
Merge branch 'develop' into rewrites/coding-convention-split2-1-2
include/acl_selectors.php
include/api.php
include/contact_selectors.php