]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efe23ed 9b3cbb3)
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes
authorMikael Nordfeldth <mmn@hethane.se>
Thu, 28 Jan 2016 16:27:08 +0000 (17:27 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Thu, 28 Jan 2016 16:27:08 +0000 (17:27 +0100)
1  2 
plugins/Oembed/OembedPlugin.php patch | diff1 | diff2 | blob | history

diff --cc plugins/Oembed/OembedPlugin.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)