Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/149ad130 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/149ad130 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/149ad130 Branch: refs/heads/develop Commit: 149ad130d91b06167db7fb45112d16fa341ad04b Parents: e0ee55e 8c7dd6a Author: Mark Payne <marka...@hotmail.com> Authored: Wed May 20 12:41:51 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Wed May 20 12:41:51 2015 -0400 ---------------------------------------------------------------------- nifi-site/Gruntfile.js | 10 ++++++++++ nifi-site/src/pages/html/download.hbs | 1 + 2 files changed, 11 insertions(+) ----------------------------------------------------------------------