Merge branch 'master' into 4570-multi-auth-method
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Jan 2015 13:45:08 +0000 (08:45 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Jan 2015 13:45:08 +0000 (08:45 -0500)
commit7b5729d984a9c516920270250f050bf72f1896d1
tree83a0722b4e39991dab99df5495dc3780576f6e54
parentb4b8bac5eb19bdfd792014250a65fbc1f7cfd007
parent9013faf477b5862cb915f1d80148daffa795cc89
Merge branch 'master' into 4570-multi-auth-method
services/api/app/controllers/user_sessions_controller.rb
services/api/config/application.default.yml