Merge branch 'develop_2.0' of github.com:swagger-api/swagger-js into develop_2.0

fehguy · fehguy · commit 7d5c68269996 · 2015-02-02T08:41:15.000-08:00
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2014 Reverb Technologies, Inc.
+Copyright 2015 Reverb Technologies, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright 2014 Reverb Technologies, Inc.`
	`1`	`+Copyright 2015 Reverb Technologies, Inc.`
`2`	`2`
`3`	`3`	`Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`you may not use this file except in compliance with the License.`