| commit | e5774f96416642de8bba108387643fb27315de0a | [log] [tgz] |
|---|---|---|
| author | Sapan Bhatia <gwsapan@gmail.com> | Wed Jun 11 17:51:32 2014 -0400 |
| committer | Sapan Bhatia <gwsapan@gmail.com> | Wed Jun 11 17:51:32 2014 -0400 |
| tree | 720cb7a34644b6c843a34c2f35aecaf671e0f5e8 | |
| parent | f7b29d209934e04409ec16bb4f66a520b70b10aa [diff] | |
| parent | 7b836b685f36434a65afc6cf2e5e8fc0ccf0a3b8 [diff] |
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi Conflicts: planetstack/core/models/user.py