mirror of
https://github.com/apache/nifi.git
synced 2025-02-16 06:55:28 +00:00
Merge branch 'develop' into NIFI-182
This commit is contained in:
commit
4146a23cee
@ -28,7 +28,7 @@
|
|||||||
<profile>
|
<profile>
|
||||||
<id>docs</id>
|
<id>docs</id>
|
||||||
<activation>
|
<activation>
|
||||||
<activeByDefault>true</activeByDefault>
|
<jdk>1.7</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
<build>
|
<build>
|
||||||
<resources>
|
<resources>
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
<title>NiFi Documentation</title>
|
<title>NiFi Documentation</title>
|
||||||
<script type="text/javascript" src="../nifi/js/jquery/jquery-1.7.min.js"></script>
|
<script type="text/javascript" src="../nifi/js/jquery/jquery-2.1.1.min.js"></script>
|
||||||
<script type="text/javascript" src="js/application.js"></script>
|
<script type="text/javascript" src="js/application.js"></script>
|
||||||
<link href="css/main.css" rel="stylesheet" type="text/css" />
|
<link href="css/main.css" rel="stylesheet" type="text/css" />
|
||||||
<link href="css/component-usage.css" rel="stylesheet" type="text/css" />
|
<link href="css/component-usage.css" rel="stylesheet" type="text/css" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user