Merge branch 'develop' of https://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/b1718494 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b1718494 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b1718494 Branch: refs/heads/master Commit: b1718494679c83a61e4f37976a58b29caba8b00f Parents: 9d6458a 063afe2 Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Fri Jul 3 09:09:15 2015 -0400 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Fri Jul 3 09:09:15 2015 -0400 ---------------------------------------------------------------------- nifi-site/src/includes/topbar.hbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------