diff options
| author | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
| commit | fc3c5994df61de04b8b17b495a638efc0d760126 (patch) | |
| tree | 644aa93dfd0a6da2ed9b20ba688712fb9082f425 /users/app/models/token.rb | |
| parent | cfb9e1d4c2e954222b77c4dd11e06ae3a0092be5 (diff) | |
| parent | 3113f8b814417a896ad5340fda88927733f8ab22 (diff) | |
Merge branch 'master' into feature/disable_account
Conflicts:
users/app/controllers/users_controller.rb
users/app/helpers/users_helper.rb
users/app/views/users/edit.html.haml
users/app/views/users/show.html.haml
users/config/locales/en.yml
Diffstat (limited to 'users/app/models/token.rb')
0 files changed, 0 insertions, 0 deletions