Merge branch '2640-folder-api' into 1970-folder-view
authorTom Clegg <tom@curoverse.com>
Tue, 29 Apr 2014 04:38:22 +0000 (00:38 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 29 Apr 2014 04:38:22 +0000 (00:38 -0400)
commit420949e37a2903ab87f64f57278dfdc6a261a7f3
treee6f090e660bb45abe8cd816978e718d4c174e893
parent2943d9c3622e2c5bca081dc48fd5d8d148dac386
parent34350a8b802a8c48b534673a712614d36a5b97ac
Merge branch '2640-folder-api' into 1970-folder-view
services/api/app/controllers/application_controller.rb