]> 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: 70ca962 8ae1328)
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Sun, 8 Mar 2015 23:36:00 +0000 (00:36 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 8 Mar 2015 23:36:00 +0000 (00:36 +0100)
Conflicts:
plugins/OStatus/OStatusPlugin.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
1  2 
lib/formaction.php patch | diff1 | diff2 | blob | history
plugins/OStatus/OStatusPlugin.php patch | diff1 | diff2 | blob | history
plugins/OStatus/classes/Ostatus_profile.php patch | diff1 | diff2 | blob | history

diff --cc lib/formaction.php
Simple merge
diff --cc plugins/OStatus/OStatusPlugin.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. :-)