Mike Greiling 7f1b934e51 Merge branch 'master' into 'prettify-all-the-karma-specs' ... # Conflicts: # spec/javascripts/clusters/components/application_row_spec.js		2018-10-17 21:50:44 +00:00
..
application_row_spec.js	Merge branch 'master' into 'prettify-all-the-karma-specs'	2018-10-17 21:50:44 +00:00
applications_spec.js	Changes after review	2018-05-28 10:17:17 +01:00