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

Posted to commits@tomee.apache.org by jg...@apache.org on 2019/06/27 10:47:44 UTC

[tomee] 05/05: Merge remote-tracking branch 'upstream/master'

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

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

commit 8f40dad1e7abc73282af050f7fb23e8f44152352
Merge: 7a04d4e 3be5d3a
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Thu Jun 27 11:47:15 2019 +0100

    Merge remote-tracking branch 'upstream/master'

 examples/access-timeout/README_es.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)