Merge branch 'master' into 3138-wiselinks
authorradhika <radhika@curoverse.com>
Mon, 21 Jul 2014 16:03:05 +0000 (12:03 -0400)
committerradhika <radhika@curoverse.com>
Mon, 21 Jul 2014 16:03:05 +0000 (12:03 -0400)
commit91a3a6759a0294c28fa55f044c2d611d01054c20
treea623bcf0294b0430f9217f002ef662309cc56add
parenta0a03c3668a3cd5956b3bd4677a15d6c86770952
parent8d3335359e3785be35818b0c4519cc499f3f2fa8
Merge branch 'master' into 3138-wiselinks
apps/workbench/app/views/layouts/application.html.erb