diff options
| author | elijah <elijah@riseup.net> | 2014-12-15 16:11:22 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-12-15 16:11:22 -0800 |
| commit | 61ed5d77ba0a6e962e645c72683855510dd0ec05 (patch) | |
| tree | b1dba926db9b9d0e584de5c69f89604741e23ea9 /app/controllers/controller_extension/token_authentication.rb | |
| parent | 546a49e3d59af2565b5b80c9ea5105d4adf0f963 (diff) | |
| parent | 6e15813d549fd9e56a48fd87d425fd31f37521e8 (diff) | |
Merge branch 'develop' into version/0.6
Diffstat (limited to 'app/controllers/controller_extension/token_authentication.rb')
0 files changed, 0 insertions, 0 deletions