Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Dzombak committed Nov 4, 2016
2 parents d542687 + e880ec8 commit a3288c1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions LICENSE.md
@@ -1,9 +1,9 @@
Copyright (c) 2016 The New York Times Company

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this library except in compliance with the License.
You may obtain a copy of the License at

[www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
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.

0 comments on commit a3288c1

Please sign in to comment.