projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bdb80a abd90bb)
Merge branch 'master' into social-master
authorRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 01:12:00 +0000 (03:12 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 01:12:00 +0000 (03:12 +0200)
Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/replies.php
classes/Notice.php
lib/noticeform.php
plugins/WebFinger/WebFingerPlugin.php

1  2 
plugins/WebFinger/WebFingerPlugin.php patch | diff1 | diff2 | blob | history

diff --cc plugins/WebFinger/WebFingerPlugin.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. :-)