projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ad7db3 73da5d8)
Merge branch 'master' into social-master
authorRoland Haeder <roland@mxchange.org>
Tue, 10 Mar 2015 02:21:23 +0000 (03:21 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 10 Mar 2015 02:21:23 +0000 (03:21 +0100)
The conflict was difference at default value (null versus better array() ).

Conflicts:
lib/docfile.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

Trivial 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. :-)