projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1269e3f 5c6b98e)
Merge branch 'master' of gitorious.org:social/mainline
authorRoland Haeder <roland@mxchange.org>
Wed, 4 Mar 2015 13:52:41 +0000 (14:52 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 4 Mar 2015 13:52:46 +0000 (14:52 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>
1  2 
lib/framework.php patch | diff1 | diff2 | blob | history

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