]> 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: a37b7b1 c831cac)
Merge branch 'master' into social-master
authorRoland Haeder <roland@mxchange.org>
Mon, 9 Mar 2015 00:19:44 +0000 (01:19 +0100)
committerRoland Haeder <roland@mxchange.org>
Mon, 9 Mar 2015 00:19:44 +0000 (01:19 +0100)
1  2 
plugins/Bookmark/BookmarkPlugin.php patch | diff1 | diff2 | blob | history

diff --cc plugins/Bookmark/BookmarkPlugin.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. :-)