From: jenkins-bot Date: Mon, 27 Apr 2015 22:54:05 +0000 (+0000) Subject: Merge "Use array_merge instead of the plus operator so that hooked functions are... X-Git-Tag: 1.31.0-rc.0~11575 X-Git-Url: http://git.cyclocoop.org/%22.%20%20%20generer_url_action%28%22logout%22%2C%22logout=prive%22%29%20.%20%20%20%22?a=commitdiff_plain;h=3cb979496f41aa5221b91469cad2c17ca3abe8f6;p=lhc%2Fweb%2Fwiklou.git Merge "Use array_merge instead of the plus operator so that hooked functions are able to override the ORDER BY condition" --- 3cb979496f41aa5221b91469cad2c17ca3abe8f6