aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUsman Khalid <2200617@gmail.com>2015-12-01 14:59:51 +0500
committerUsman Khalid <2200617@gmail.com>2015-12-01 14:59:51 +0500
commit86b822c24fe16e62bfb85e23ee54fca0bd7cd748 (patch)
tree0322726a8e77cf487fad838ca54834920ce59717
parentcf6ba4310a59b60d4e2733a4d49724f367c13fb5 (diff)
parent1c68dd72078ed0775fcfad23fd85b337e12d0433 (diff)
Merge pull request #3 from edx/usman/readme
Added some notes to the README.
-rw-r--r--README.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/README.txt b/README.txt
index 46b5c07..59dc23b 100644
--- a/README.txt
+++ b/README.txt
@@ -1,3 +1,15 @@
+
+This is a fork of https://launchpad.net/django-openid-auth. It has the following differences from upstream:
+
+* https://github.com/edx/django-openid-auth/pull/1.
+
+
+To bring in the latest changes:
+1. Import commits from the bazaar repo to the `upstream` branch of this repo using https://design.canonical.com/2015/01/converting-projects-between-git-and-bazaar/.
+2. Merge them into master.
+
+
+
= Django OpenID Authentication Support =
This package provides integration between Django's authentication