]> 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: b92ef93 6f58aea)
Merge commit 'refs/merge-requests/29' of https://gitorious.org/social/mainline into...
authorRoland Haeder <roland@mxchange.org>
Sat, 17 Jan 2015 11:39:34 +0000 (12:39 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 17 Jan 2015 11:39:58 +0000 (12:39 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>
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. :-)