Merge branch '2640-folder-api' into 1970-folder-view
authorTom Clegg <tom@curoverse.com>
Fri, 2 May 2014 02:24:06 +0000 (22:24 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 2 May 2014 02:24:06 +0000 (22:24 -0400)
commit70fa68ef9087dd85d6e18fba2ef11f94ddeb95a4
treed745b6d063a8e99a6434d8cc01876987c9242b20
parent4aee1d7246e344099fe7e10264d009e49aeafee0
parent2bb2789ff129b4112d81ba343fadfb7ad362ecd1
Merge branch '2640-folder-api' into 1970-folder-view
services/api/app/controllers/application_controller.rb