]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit035aae2745e25d44ab9fe1b7bdffbcaa505ba970
treef2ead51b3beb9f066cd1e0eb500d155c9fd9b2d6tree | snapshot
parent0ad7db30865e5eda03c100e347438aa9cb3bfca2commit | diff
parent73da5d8467b9bfc3b659aad01d778f919168d6b9commit | diff
Merge branch 'master' into social-master

The conflict was difference at default value (null versus better array() ).

Conflicts:
lib/docfile.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)