Skip to content

Commit

Permalink
Merge pull request #4037 from pangratz/happy-new-year
Browse files Browse the repository at this point in the history
Happy New Year!
  • Loading branch information
bmac committed Jan 3, 2016
2 parents 99dec65 + 3e0bf4d commit 2108b42
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2011-2015 Tilde, Inc. and contributors.
Copyright (C) 2011-2016 Tilde, Inc. and contributors.
Portions Copyright (C) 2011 LivingSocial Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
2 changes: 1 addition & 1 deletion generators/license.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* @overview Ember Data
* @copyright Copyright 2011-2015 Tilde Inc. and contributors.
* @copyright Copyright 2011-2016 Tilde Inc. and contributors.
* Portions Copyright 2011 LivingSocial Inc.
* @license Licensed under MIT license (see license.js)
* @version VERSION_STRING_PLACEHOLDER
Expand Down

0 comments on commit 2108b42

Please sign in to comment.