]> 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: cbc6d98 9054bb6)
Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master
authorRoland Haeder <roland@mxchange.org>
Sat, 4 Jul 2015 18:02:11 +0000 (20:02 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 4 Jul 2015 18:02:17 +0000 (20:02 +0200)
Signed-off-by: Roland Haeder <roland@mxchange.org>
1  2 
lib/profileaction.php patch | diff1 | diff2 | blob | history

diff --cc lib/profileaction.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. :-)