Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BE5C2200C1F for ; Fri, 3 Feb 2017 20:00:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BD0C0160B6F; Fri, 3 Feb 2017 19:00:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 07113160B55 for ; Fri, 3 Feb 2017 20:00:42 +0100 (CET) Received: (qmail 35371 invoked by uid 500); 3 Feb 2017 19:00:42 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 35263 invoked by uid 99); 3 Feb 2017 19:00:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2017 19:00:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EF332DFF26; Fri, 3 Feb 2017 19:00:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: carlosrovira@apache.org To: commits@flex.apache.org Date: Fri, 03 Feb 2017 19:00:43 -0000 Message-Id: <2dd2ee943c0a40209a703a10b7a53e04@git.apache.org> In-Reply-To: <7adc8bc133c745a9938e3e9c92158b5a@git.apache.org> References: <7adc8bc133c745a9938e3e9c92158b5a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/16] git commit: [flex-asjs] [refs/heads/feature/mdl] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop archived-at: Fri, 03 Feb 2017 19:00:43 -0000 Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8dc4524e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8dc4524e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8dc4524e Branch: refs/heads/feature/mdl Commit: 8dc4524ebc659724b389338a2cf071cc824de91e Parents: ca2825e c6dc46e Author: Carlos Rovira Authored: Wed Feb 1 21:24:20 2017 +0100 Committer: Carlos Rovira Committed: Wed Feb 1 21:24:20 2017 +0100 ---------------------------------------------------------------------- examples/flexjs/MDLExample/asconfig.json | 2 +- .../MDLExample/src/main/resources/mdl-js-index-template.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------