Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5FD92EDF9 for ; Mon, 25 Feb 2013 03:34:46 +0000 (UTC) Received: (qmail 4825 invoked by uid 500); 25 Feb 2013 03:34:45 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 4733 invoked by uid 500); 25 Feb 2013 03:34:45 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 4072 invoked by uid 99); 25 Feb 2013 03:34:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Feb 2013 03:34:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 781EA82F6E3; Mon, 25 Feb 2013 03:34:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/7] git commit: Merge pull request #15 from cloudant-labs/fauxton-assets-for-addons Message-Id: <20130225033435.781EA82F6E3@tyr.zones.apache.org> Date: Mon, 25 Feb 2013 03:34:35 +0000 (UTC) Merge pull request #15 from cloudant-labs/fauxton-assets-for-addons Assets for addons Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ff4140f0 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ff4140f0 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ff4140f0 Branch: refs/heads/fauxton Commit: ff4140f045e0896392d8a11a539ed53cc670d0e5 Parents: c31fa4b 4d6340e Author: Simon Metson Authored: Wed Feb 13 02:53:52 2013 -0800 Committer: Simon Metson Committed: Wed Feb 13 02:53:52 2013 -0800 ---------------------------------------------------------------------- src/fauxton/grunt.js | 60 +++++++++++++++++++++++++++++++++------------ 1 files changed, 44 insertions(+), 16 deletions(-) ----------------------------------------------------------------------