Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
re-license under Apache 2.0
  • Loading branch information
jweiss committed Nov 21, 2011
1 parent 192b58b commit 72e4622
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,8 @@
Changelog Changelog
============= =============


- re-license under Apache 2.0

0.7.0 0.7.0


- Compatible with Rails 3.1 --> Requires ActiveModel and ActiveSupport 3.1 - Compatible with Rails 3.1 --> Requires ActiveModel and ActiveSupport 3.1
Expand Down
28 changes: 13 additions & 15 deletions LICENSE.txt
@@ -1,15 +1,13 @@
/* Copyright 2010-2011 Peritor GmbH
* Copyright (c) 2010 Peritor GmbH <info@peritor.com>
* Licensed under the Apache License, Version 2.0 (the "License");
* Permission to use, copy, modify, and distribute this software for any you may not use this file except in compliance with the License.
* purpose with or without fee is hereby granted, provided that the above You may obtain a copy of the License at
* copyright notice and this permission notice appear in all copies.
* http://www.apache.org/licenses/LICENSE-2.0
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF Unless required by applicable law or agreed to in writing, software
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR distributed under the License is distributed on an "AS IS" BASIS,
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN See the License for the specific language governing permissions and
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF limitations under the License.
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -329,11 +329,11 @@ If auto_conflict_resolution_on_save is enabled, something like this will work:
License License
============= =============


SimplyStored is licensed under the OpenBSD / two-clause BSD license, modeled after the ISC license. See LICENSE.txt SimplyStored is licensed under the Apache 2.0 license. See LICENSE.txt


About About
============= =============


SimplyStored was written by [Mathias Meyer](http://twitter.com/roidrage) and [Jonathan Weiss](http://twitter.com/jweiss) for [Peritor](http://www.peritor.com). SimplyStored was written by [Mathias Meyer](http://twitter.com/roidrage) and [Jonathan Weiss](http://twitter.com/jweiss) for [Peritor](http://www.peritor.com).




0 comments on commit 72e4622

Please sign in to comment.