3781: Merge branch 'master' into 3781-browser-friendly-servers
authorTom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 05:56:27 +0000 (00:56 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 05:56:27 +0000 (00:56 -0500)
commitf12f617fb736ddd48e4f2b9f57a6983ff8fe1ed3
tree5da91b02f660c015ca704c03f6ea794751dd0fa2
parent1f91e02c279bc1e7c47d88da43b72c6882b0ad77
parent84efd065eba386e98e07cdd232dc172e169af451
3781: Merge branch 'master' into 3781-browser-friendly-servers
services/api/app/controllers/application_controller.rb