From commits-return-52623-archive-asf-public=cust-asf.ponee.io@cordova.apache.org Wed Mar 14 20:44:40 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 209DF18067B for ; Wed, 14 Mar 2018 20:44:39 +0100 (CET) Received: (qmail 64256 invoked by uid 500); 14 Mar 2018 19:44:39 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 64182 invoked by uid 99); 14 Mar 2018 19:44:39 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Mar 2018 19:44:39 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 98A438060C; Wed, 14 Mar 2018 19:44:38 +0000 (UTC) Date: Wed, 14 Mar 2018 19:44:39 +0000 To: "commits@cordova.apache.org" Subject: [cordova-plugin-camera] 01/01: Merge pull request #275 from cjpearson/CB12953 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: bowserj@apache.org In-Reply-To: <152105667852.25570.9171400994530080818@gitbox.apache.org> References: <152105667852.25570.9171400994530080818@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: cordova-plugin-camera X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: c8581ba2c9b057987b890483c22c09bb17414077 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180314194438.98A438060C@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. bowserj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cordova-plugin-camera.git commit c8581ba2c9b057987b890483c22c09bb17414077 Merge: e36482c cfefa53 Author: Joe Bowser AuthorDate: Wed Mar 14 12:44:35 2018 -0700 Merge pull request #275 from cjpearson/CB12953 CB-12593: (android) Fix potential FileProvider conflicts plugin.xml | 7 ++++--- src/android/FileProvider.java | 21 +++++++++++++++++++++ ...provider_paths.xml => camera_provider_paths.xml} | 0 3 files changed, 25 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact bowserj@apache.org. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org