You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jmeter.apache.org by mi...@apache.org on 2023/05/10 11:53:54 UTC

[jmeter] 02/03: Merge branch 'Fix_NFE_on_counter_button'

This is an automated email from the ASF dual-hosted git repository.

milamber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 7f9219c3b508df1789f4cdcd1aef9f8fb069e460
Merge: 193bd552d4 45eff09fac
Author: Milamber <mi...@apache.org>
AuthorDate: Wed May 10 12:51:00 2023 +0100

    Merge branch 'Fix_NFE_on_counter_button'
    
    See PR #5901

 .../apache/jmeter/resources/messages.properties    |  2 +
 .../apache/jmeter/resources/messages_fr.properties |  2 +
 .../protocol/http/proxy/gui/ProxyControlGui.java   | 50 +++++++++++++++-------
 3 files changed, 38 insertions(+), 16 deletions(-)