x
/
fuel-plugin-fortinet
Code Issues Proposed changes

Merge branch 'master' of ssh://github.com/jerryz1982/fuel-plugin-fortinet 

Conflicts:
	LICENSE
This commit is contained in:
Jerry Zhao 2016-05-25 17:37:34 -07:00
parent e956a4e203 47e7ecdb59
commit 69551066a0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LICENSE
View File

@ -1,4 +1,4 @@
Apache License
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@ -199,4 +199,3 @@ Apache License
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.