Merge pull request #3 from apache/develop

Merging in latest develop branch

Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b71b5197
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b71b5197
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b71b5197

Branch: refs/heads/NIFI-632
Commit: b71b51976eb6e5afba636c8dd16e33a7436e3999
Parents: 9653770 483958b
Author: Brian Ghigiarelli <briang...@gmail.com>
Authored: Thu May 14 08:57:25 2015 -0400
Committer: Brian Ghigiarelli <briang...@gmail.com>
Committed: Thu May 14 08:57:25 2015 -0400

----------------------------------------------------------------------
 nifi-site/Gruntfile.js             |  23 ++--
 nifi-site/README.md                |   3 +-
 nifi-site/src/pages/html/index.hbs | 179 ++++----------------------------
 3 files changed, 37 insertions(+), 168 deletions(-)
----------------------------------------------------------------------


Reply via email to