Merge remote-tracking branch 'security/QA_4_7-security' into QA_4_7-security
commit5503abe53a4ee1d8481c2c4283cb7341e1bff03e
authorMichal Čihař <michal@cihar.com>
Mon, 18 Dec 2017 10:49:44 +0000 (18 11:49 +0100)
committerMichal Čihař <michal@cihar.com>
Mon, 18 Dec 2017 10:49:44 +0000 (18 11:49 +0100)
tree506483bd477e646287e6834a740fc79b9ffb72f9
parent44df4a309475479af404506dbd77588acc424637
parent5d71c3972f8feb7d2ed9ee6ac82596a4d6bdbe36
Merge remote-tracking branch 'security/QA_4_7-security' into QA_4_7-security
test/classes/DisplayResultsTest.php