Merge branch 'master' of https://github.com/okfn/ckan

ckan · Jul 24, 2012 · 3e0de27 · 3e0de27
2 parents 119ebb5 + dbc8766
commit 3e0de27
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -22,9 +22,9 @@ Note
 ====
 
 CKAN is sometimes packaged directly with other software (listed in
-requires/lucid_conflict.txt). In these cases, we are required to list the
-licenses of the packaged softare too. They are all AGPL compatible and read as
-follows in the next sections.
+pip-requirements.txt, pip-requirements-test.txt and pip-requirements-docs.txt).
+In these cases, we are required to list the licenses of the packaged softare
+too. They are all AGPL compatible and read as follows in the next sections.
 
 WebHelpers
 ----------