Permalink
Browse files

Merge remote-tracking branch 'eyedee.me/master'

Conflicts:
	package.json
  • Loading branch information...
2 parents 28a1ae7 + 1a762b9 commit 899752b1f966e6a9ec3b2be2092903a4b7a66155 @lloyd lloyd committed Aug 30, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 README.md
View
@@ -54,3 +54,4 @@ HTTPS connections and forward them to a running EyeDee.Me instance, such as
the one on the port defined above. Otherwise, your users will not be forwarded
to your Identity Provider for authentication when logging in to sites with
Persona.
+

0 comments on commit 899752b

Please sign in to comment.