fixed config for php >=5; see php.net/array_merge master
authorFlorian Hülsmann <fh@cbix.de>
Sun, 30 Mar 2014 14:56:48 +0000 (16:56 +0200)
committerFlorian Hülsmann <fh@cbix.de>
Sun, 30 Mar 2014 14:56:48 +0000 (16:56 +0200)
commit58d1300745c9778e47d2b5bc8f6ce0772fbe9553
tree0a0ba11d06af7f1fd5a51502a6de7df108f51fe2
parent53d54eb929fc2577529d45e68b77f3cdec52b2ed
fixed config for php >=5; see php.net/array_merge
lib/statusnet.php