aboutsummaryrefslogtreecommitdiff
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorJonas Genannt <genannt@debian.org>2015-11-15 22:26:10 +0100
committerJonas Genannt <genannt@debian.org>2015-11-15 22:26:10 +0100
commitda6a2bd205506257eaa6785c00981c88146d6c9f (patch)
tree6636c5e5a0186d9bf42c0df12bbb2180480ace7b /LICENSE.txt
parent24cd0a91184be6fa20168f9b132b1ab3f5911949 (diff)
parentd65aa3c3c146b12548a54c894060bce9a8715ad2 (diff)
downloadpython-django-tagging-da6a2bd205506257eaa6785c00981c88146d6c9f.tar
python-django-tagging-da6a2bd205506257eaa6785c00981c88146d6c9f.tar.gz
Merge tag 'upstream/0.4'
Upstream version 0.4 # gpg: Signature made Sun 15 Nov 2015 10:26:06 PM CET using RSA key ID 016CFFD0 # gpg: Good signature from "Jonas Genannt <jonas@brachium-system.net>" # gpg: aka "Jonas Genannt <jonas.genannt@capi2name.de>" # gpg: aka "Jonas Genannt <genannt@debian.org>" * tag 'upstream/0.4': Imported Upstream version 0.4
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 1654536..59f77e7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
Django Tagging
--------------
-Copyright (c) 2007, Jonathan Buchanan
+Copyright (c) 2007-2015, Jonathan Buchanan, Julien Fache
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
@@ -52,4 +52,4 @@ 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. \ No newline at end of file
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.