Merge branch 'master' of github.com:Connoropolous/metamaps_gen002

This commit is contained in:
Connor Turland 2012-11-03 13:00:30 -04:00
commit 9842347344

View file

@ -8,10 +8,18 @@ connor:
persistence_token:
perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc
devin:
name: Devin Howard
email: devin@callysto.com
password_salt: i9vWzlSSPA3uIaer5jk
crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972
persistence_token:
perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc
ishan:
name: Ishan Shapiro
email: ishanshapiro@gmail.com
password_salt: i9vWzlSSPA3uIaer5jk
crypted_password: a5cfab00b857a0c0c82a007a5fe3a6599f60bbccb9f12eef5a3b919c22d77412b5fa2af3e18bb98d40f29d5bf28deca305320ca102adb48795d91450af3ba972
persistence_token:
perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc
perishable_token: 90282eaaf66e43fcff6db3c169ca20ea877adfab86c9bfe4df5f29a138ae901226195b9628d31a6ece65162814c5a3fc49c62e37f64382439473f787bdcb58cc