diff options
| author | jessib <jessib@riseup.net> | 2013-11-21 11:22:30 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-11-21 11:22:30 -0800 |
| commit | 15b234bf798f3c6347f3c5a13fd1ddfdb744354d (patch) | |
| tree | 2850982de44badbe87e06dca2adbaf9493a26215 /users/app/controllers/controller_extension/token_authentication.rb | |
| parent | f1bc68c73e7183a0ad30c6aefc6cc4cbbf1bc1f0 (diff) | |
| parent | 19eac22510fcb4ad74456cc3872196fa1e63a93d (diff) | |
Merge branch 'develop' into feature/return_public_key
Diffstat (limited to 'users/app/controllers/controller_extension/token_authentication.rb')
0 files changed, 0 insertions, 0 deletions