3235: Merge branch 'master' into 3235-top-nav-site-search
authorTom Clegg <tom@curoverse.com>
Mon, 21 Jul 2014 18:28:17 +0000 (14:28 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 21 Jul 2014 18:28:17 +0000 (14:28 -0400)
commit889d94070d54e47ddb44afcfe457cbaed2e6a2e3
tree5826b5c05c7146afacb780ca44e5ed1cbe9f53ae
parentdd198047ab128658010869830b27ef6b83f5182e
parent589d2b599714a5e3c239aa25029f1a0a4261f520
3235: Merge branch 'master' into 3235-top-nav-site-search

Conflicts:
apps/workbench/app/views/application/_choose.html.erb
apps/workbench/app/views/application/_choose.html.erb
apps/workbench/config/routes.rb