diff options
author | jessib <jessib@riseup.net> | 2014-01-06 11:19:04 -0800 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2014-01-06 11:19:04 -0800 |
commit | 0f803750a8540ce2e52c508acdd7279b9e85b507 (patch) | |
tree | 0b55c73afe9436625164677c05f34da7af6ebfdc /users/app/models/token.rb | |
parent | 47d9b62913789358aefe769de6b7e33da8547891 (diff) | |
parent | b9de6cfeac4ef061f3110afa0be959e41cb6f885 (diff) |
Merge branch 'develop' into feature/messages_cron
Diffstat (limited to 'users/app/models/token.rb')
0 files changed, 0 insertions, 0 deletions