diff options
| author | Azul <azul@leap.se> | 2013-01-25 11:46:22 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-01-25 11:46:22 +0100 |
| commit | dac578781baf73a006cc78e29588dd1f6fdc0fd3 (patch) | |
| tree | a56ecff398a87efdd4840a8fc897d6471fbdaa69 /users/app/controllers/.gitkeep | |
| parent | 75442ad26f3d30519f747bc98bc83cdc76aff750 (diff) | |
| parent | 9d053b6c9b61c68bf11f95bcb37631a518f1fba4 (diff) | |
Merge branch 'feature/webfinger' of https://github.com/leapcode/leap_web
Conflicts:
users/app/views/users/edit.html.haml
Diffstat (limited to 'users/app/controllers/.gitkeep')
0 files changed, 0 insertions, 0 deletions