add readme/license stuff

This commit is contained in:
James Turk 2015-06-16 17:13:45 -04:00
parent 84764f727b
commit 8aff1f9eb5
2 changed files with 22 additions and 1 deletions

10
LICENSE Normal file
View File

@ -0,0 +1,10 @@
Copyright (c) 2015, James Turk
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View File

@ -1,7 +1,18 @@
==================
django-mergeobject
==================
**EXPERIMENTAL**
.. image:: https://travis-ci.org/jamesturk/django-mergeobject.svg?branch=master
:target: https://travis-ci.org/jamesturk/django-mergeobject
.. image:: https://img.shields.io/pypi/v/django-mergeobject.svg
:target: https://pypi.python.org/pypi/django-mergeobject
automatically replace foreign keys as part of a merge operation
somewhat tested on Django 1.7 and 1.8
very likely has some unsupported edge cases
very likely has some unsupported edge cases, use with caution